A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 3.7-rc1 into tty-linus

Browse source 
This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2012-10-14 22:41:27 -07:00
commit c362495586
6742 changed files with 269285 additions and 133200 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/irda/af_irda.c
View file

@ -468,7 +468,7 @@ static int irda_open_tsap(struct irda_sock *self, __u8 tsap_sel, char *name)
notify_t notify;
if (self->tsap) {
IRDA_WARNING("%s: busy!\n", __func__);
IRDA_DEBUG(0, "%s: busy!\n", __func__);
return -EBUSY;
}

2
net/irda/irttp.c
View file

@ -440,7 +440,7 @@ struct tsap_cb *irttp_open_tsap(__u8 stsap_sel, int credit, notify_t *notify)
*/
lsap = irlmp_open_lsap(stsap_sel, &ttp_notify, 0);
if (lsap == NULL) {
IRDA_WARNING("%s: unable to allocate LSAP!!\n", __func__);
IRDA_DEBUG(0, "%s: unable to allocate LSAP!!\n", __func__);
return NULL;
}