aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/rfcomm/tty.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index c9191871c1e0..0a387f2eb7a9 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -617,14 +617,7 @@ static void rfcomm_tty_wakeup(unsigned long arg)
617 return; 617 return;
618 618
619 BT_DBG("dev %p tty %p", dev, tty); 619 BT_DBG("dev %p tty %p", dev, tty);
620 620 tty_wakeup(tty);
621 if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && tty->ldisc.write_wakeup)
622 (tty->ldisc.write_wakeup)(tty);
623
624 wake_up_interruptible(&tty->write_wait);
625#ifdef SERIAL_HAVE_POLL_WAIT
626 wake_up_interruptible(&tty->poll_wait);
627#endif
628} 621}
629 622
630static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp) 623static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
@@ -1005,9 +998,7 @@ static void rfcomm_tty_flush_buffer(struct tty_struct *tty)
1005 return; 998 return;
1006 999
1007 skb_queue_purge(&dev->dlc->tx_queue); 1000 skb_queue_purge(&dev->dlc->tx_queue);
1008 1001 tty_wakeup(tty);
1009 if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && tty->ldisc.write_wakeup)
1010 tty->ldisc.write_wakeup(tty);
1011} 1002}
1012 1003
1013static void rfcomm_tty_send_xchar(struct tty_struct *tty, char ch) 1004static void rfcomm_tty_send_xchar(struct tty_struct *tty, char ch)