Merge tag 'tty-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into next

Pull tty/serial driver updates from Greg KH:
 "Here is the big tty / serial driver pull request for 3.16-rc1.

  A variety of different serial driver fixes and updates and additions,
  nothing huge, and no real major core tty changes at all.

  All have been in linux-next for a while"

* tag 'tty-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (84 commits)
  Revert "serial: imx: remove the DMA wait queue"
  serial: kgdb_nmi: Improve console integration with KDB I/O
  serial: kgdb_nmi: Switch from tasklets to real timers
  serial: kgdb_nmi: Use container_of() to locate private data
  serial: cpm_uart: No LF conversion in put_poll_char()
  serial: sirf: Fix compilation failure
  console: Remove superfluous readonly check
  console: Use explicit pointer type for vc_uni_pagedir* fields
  vgacon: Fix & cleanup refcounting
  ARM: tty: Move HVC DCC assembly to arch/arm
  tty/hvc/hvc_console: Fix wakeup of HVC thread on hvc_kick()
  drivers/tty/n_hdlc.c: replace kmalloc/memset by kzalloc
  vt: emulate 8- and 24-bit colour codes.
  printk/of_serial: fix serial console cessation part way through boot.
  serial: 8250_dma: check the result of TX buffer mapping
  serial: uart: add hw flow control support configuration
  tty/serial: at91: add interrupts for modem control lines
  tty/serial: at91: use mctrl_gpio helpers
  tty/serial: Add GPIOLIB helpers for controlling modem lines
  ARM: at91: gpio: implement get_direction
  ...

2 files changed, 20 insertions, 5 deletions

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index f1fbf4f1e5be..e00f8f5b5c8e 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -118,10 +118,6 @@ static inline struct sk_buff *hci_uart_dequeue(struct hci_uart *hu)
 
 int hci_uart_tx_wakeup(struct hci_uart *hu)
 {
-        struct tty_struct *tty = hu->tty;
-        struct hci_dev *hdev = hu->hdev;
-        struct sk_buff *skb;
-
         if (test_and_set_bit(HCI_UART_SENDING, &hu->tx_state)) {
                 set_bit(HCI_UART_TX_WAKEUP, &hu->tx_state);
                 return 0;
@@ -129,6 +125,22 @@ int hci_uart_tx_wakeup(struct hci_uart *hu)
 
         BT_DBG("");
 
+        schedule_work(&hu->write_work);
+
+        return 0;
+}
+
+static void hci_uart_write_work(struct work_struct *work)
+{
+        struct hci_uart *hu = container_of(work, struct hci_uart, write_work);
+        struct tty_struct *tty = hu->tty;
+        struct hci_dev *hdev = hu->hdev;
+        struct sk_buff *skb;
+
+        /* REVISIT: should we cope with bad skbs or ->write() returning
+         * and error value ?
+         */
+
 restart:
         clear_bit(HCI_UART_TX_WAKEUP, &hu->tx_state);
 
@@ -153,7 +165,6 @@ restart:
                 goto restart;
 
         clear_bit(HCI_UART_SENDING, &hu->tx_state);
-        return 0;
 }
 
 static void hci_uart_init_work(struct work_struct *work)
@@ -282,6 +293,7 @@ static int hci_uart_tty_open(struct tty_struct *tty)
         tty->receive_room = 65536;
 
         INIT_WORK(&hu->init_ready, hci_uart_init_work);
+        INIT_WORK(&hu->write_work, hci_uart_write_work);
 
         spin_lock_init(&hu->rx_lock);
 
@@ -319,6 +331,8 @@ static void hci_uart_tty_close(struct tty_struct *tty)
         if (hdev)
                 hci_uart_close(hdev);
 
+        cancel_work_sync(&hu->write_work);
+
         if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) {
                 if (hdev) {
                         if (test_bit(HCI_UART_REGISTERED, &hu->flags))
diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h
index fffa61ff5cb1..12df101ca942 100644
--- a/drivers/bluetooth/hci_uart.h
+++ b/drivers/bluetooth/hci_uart.h
@@ -68,6 +68,7 @@ struct hci_uart {
         unsigned long           hdev_flags;
 
         struct work_struct      init_ready;
+        struct work_struct      write_work;
 
         struct hci_uart_proto   *proto;
         void                    *priv;