File tree Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -1713,14 +1713,6 @@ int hci_dev_do_close(struct hci_dev *hdev)
1713
1713
1714
1714
BT_DBG ("%s %p" , hdev -> name , hdev );
1715
1715
1716
- if (!hci_dev_test_flag (hdev , HCI_UNREGISTER ) &&
1717
- !hci_dev_test_flag (hdev , HCI_USER_CHANNEL ) &&
1718
- test_bit (HCI_UP , & hdev -> flags )) {
1719
- /* Execute vendor specific shutdown routine */
1720
- if (hdev -> shutdown )
1721
- hdev -> shutdown (hdev );
1722
- }
1723
-
1724
1716
cancel_delayed_work (& hdev -> power_off );
1725
1717
1726
1718
hci_request_cancel_all (hdev );
@@ -1796,6 +1788,14 @@ int hci_dev_do_close(struct hci_dev *hdev)
1796
1788
clear_bit (HCI_INIT , & hdev -> flags );
1797
1789
}
1798
1790
1791
+ if (!hci_dev_test_flag (hdev , HCI_UNREGISTER ) &&
1792
+ !hci_dev_test_flag (hdev , HCI_USER_CHANNEL ) &&
1793
+ test_bit (HCI_UP , & hdev -> flags )) {
1794
+ /* Execute vendor specific shutdown routine */
1795
+ if (hdev -> shutdown )
1796
+ hdev -> shutdown (hdev );
1797
+ }
1798
+
1799
1799
/* flush cmd work */
1800
1800
flush_work (& hdev -> cmd_work );
1801
1801
You can’t perform that action at this time.
0 commit comments