mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge 4.5-rc4 into tty-next
We want the fixes in here, and this resolves a merge error in tty_io.c Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
249f3c4fe4
734 changed files with 6587 additions and 56895 deletions
|
|
@ -134,11 +134,10 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
|
|||
return -1;
|
||||
}
|
||||
skb_put(skb, count);
|
||||
pr_debug("%s(), skb->len=%d\n", __func__, skb->len);
|
||||
|
||||
spin_unlock_irqrestore(&self->spinlock, flags);
|
||||
|
||||
pr_debug("%s(), skb->len=%d\n", __func__ , skb->len);
|
||||
|
||||
if (flush) {
|
||||
/* ircomm_tty_do_softint will take care of the rest */
|
||||
schedule_work(&self->tqueue);
|
||||
|
|
|
|||
Loading…
Reference in a new issue