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-05-14

Here are two more Bluetooth patches for the 4.7 kernel which we wanted
to get into net-next before the merge window opens. Please let me know
if there are any issues pulling. Thanks.
====================

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

1 files changed, 2 insertions, 2 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 2713fc86e85a..45a9fc68c677 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3139,10 +3139,10 @@ void hci_unregister_dev(struct hci_dev *hdev)
         list_del(&hdev->list);
         write_unlock(&hci_dev_list_lock);
 
-        hci_dev_do_close(hdev);
-
         cancel_work_sync(&hdev->power_on);
 
+        hci_dev_do_close(hdev);
+
         if (!test_bit(HCI_INIT, &hdev->flags) &&
             !hci_dev_test_flag(hdev, HCI_SETUP) &&
             !hci_dev_test_flag(hdev, HCI_CONFIG)) {