diff options
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/rfcomm/tty.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 5d163571d3f7..d3340dd52bcf 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c | |||
@@ -643,14 +643,7 @@ static void rfcomm_tty_wakeup(unsigned long arg) | |||
643 | return; | 643 | return; |
644 | 644 | ||
645 | BT_DBG("dev %p tty %p", dev, tty); | 645 | BT_DBG("dev %p tty %p", dev, tty); |
646 | 646 | tty_wakeup(tty); | |
647 | if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && tty->ldisc.write_wakeup) | ||
648 | (tty->ldisc.write_wakeup)(tty); | ||
649 | |||
650 | wake_up_interruptible(&tty->write_wait); | ||
651 | #ifdef SERIAL_HAVE_POLL_WAIT | ||
652 | wake_up_interruptible(&tty->poll_wait); | ||
653 | #endif | ||
654 | } | 647 | } |
655 | 648 | ||
656 | static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev) | 649 | static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev) |
@@ -1059,9 +1052,7 @@ static void rfcomm_tty_flush_buffer(struct tty_struct *tty) | |||
1059 | return; | 1052 | return; |
1060 | 1053 | ||
1061 | skb_queue_purge(&dev->dlc->tx_queue); | 1054 | skb_queue_purge(&dev->dlc->tx_queue); |
1062 | 1055 | tty_wakeup(tty); | |
1063 | if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && tty->ldisc.write_wakeup) | ||
1064 | tty->ldisc.write_wakeup(tty); | ||
1065 | } | 1056 | } |
1066 | 1057 | ||
1067 | static void rfcomm_tty_send_xchar(struct tty_struct *tty, char ch) | 1058 | static void rfcomm_tty_send_xchar(struct tty_struct *tty, char ch) |