mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'master' into for-next
Conflicts: drivers/devfreq/exynos4_bus.c Sync with Linus' tree to be able to apply patches that are against newer code (mvneta).
This commit is contained in:
commit
617677295b
11382 changed files with 530741 additions and 302619 deletions
|
|
@ -183,6 +183,7 @@ static void __exit __ircomm_tty_cleanup(struct ircomm_tty_cb *self)
|
|||
ircomm_tty_shutdown(self);
|
||||
|
||||
self->magic = 0;
|
||||
tty_port_destroy(&self->port);
|
||||
kfree(self);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -441,6 +441,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_DEBUG(0, "%s: unable to allocate LSAP!!\n", __func__);
|
||||
__irttp_close_tsap(self);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue