Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
pull request: bluetooth-next 2016-04-12

Here's a set of Bluetooth & 802.15.4 patches intended for the 4.7 kernel:

 - Fix for race condition in vhci driver
 - Memory leak fix for ieee802154/adf7242 driver
 - Improvements to deal with single-mode (LE-only) Bluetooth controllers
 - Fix for allowing the BT_SECURITY_FIPS security level
 - New BCM2E71 ACPI ID
 - NULL pointer dereference fix fox hci_ldisc driver

Let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index c00168a5bb80..49b3e1e2d236 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -227,7 +227,7 @@ static int hci_uart_flush(struct hci_dev *hdev)
         tty_ldisc_flush(tty);
         tty_driver_flush_buffer(tty);
 
-        if (test_bit(HCI_UART_PROTO_SET, &hu->flags))
+        if (test_bit(HCI_UART_PROTO_READY, &hu->flags))
                 hu->proto->flush(hu);
 
         return 0;
@@ -492,7 +492,7 @@ static void hci_uart_tty_close(struct tty_struct *tty)
 
         cancel_work_sync(&hu->write_work);
 
-        if (test_and_clear_bit(HCI_UART_PROTO_SET, &hu->flags)) {
+        if (test_and_clear_bit(HCI_UART_PROTO_READY, &hu->flags)) {
                 if (hdev) {
                         if (test_bit(HCI_UART_REGISTERED, &hu->flags))
                                 hci_unregister_dev(hdev);
@@ -500,6 +500,7 @@ static void hci_uart_tty_close(struct tty_struct *tty)
                 }
                 hu->proto->close(hu);
         }
+        clear_bit(HCI_UART_PROTO_SET, &hu->flags);
 
         kfree(hu);
 }
@@ -526,7 +527,7 @@ static void hci_uart_tty_wakeup(struct tty_struct *tty)
         if (tty != hu->tty)
                 return;
 
-        if (test_bit(HCI_UART_PROTO_SET, &hu->flags))
+        if (test_bit(HCI_UART_PROTO_READY, &hu->flags))
                 hci_uart_tx_wakeup(hu);
 }
 
@@ -550,7 +551,7 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data,
         if (!hu || tty != hu->tty)
                 return;
 
-        if (!test_bit(HCI_UART_PROTO_SET, &hu->flags))
+        if (!test_bit(HCI_UART_PROTO_READY, &hu->flags))
                 return;
 
         /* It does not need a lock here as it is already protected by a mutex in
@@ -638,9 +639,11 @@ static int hci_uart_set_proto(struct hci_uart *hu, int id)
                 return err;
 
         hu->proto = p;
+        set_bit(HCI_UART_PROTO_READY, &hu->flags);
 
         err = hci_uart_register_dev(hu);
         if (err) {
+                clear_bit(HCI_UART_PROTO_READY, &hu->flags);
                 p->close(hu);
                 return err;
         }