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 @@ -1666,14 +1666,6 @@ int hci_dev_do_close(struct hci_dev *hdev)
1666
1666
1667
1667
BT_DBG ("%s %p" , hdev -> name , hdev );
1668
1668
1669
- if (!hci_dev_test_flag (hdev , HCI_UNREGISTER ) &&
1670
- !hci_dev_test_flag (hdev , HCI_USER_CHANNEL ) &&
1671
- test_bit (HCI_UP , & hdev -> flags )) {
1672
- /* Execute vendor specific shutdown routine */
1673
- if (hdev -> shutdown )
1674
- hdev -> shutdown (hdev );
1675
- }
1676
-
1677
1669
cancel_delayed_work (& hdev -> power_off );
1678
1670
1679
1671
hci_req_cancel (hdev , ENODEV );
@@ -1746,6 +1738,14 @@ int hci_dev_do_close(struct hci_dev *hdev)
1746
1738
clear_bit (HCI_INIT , & hdev -> flags );
1747
1739
}
1748
1740
1741
+ if (!hci_dev_test_flag (hdev , HCI_UNREGISTER ) &&
1742
+ !hci_dev_test_flag (hdev , HCI_USER_CHANNEL ) &&
1743
+ test_bit (HCI_UP , & hdev -> flags )) {
1744
+ /* Execute vendor specific shutdown routine */
1745
+ if (hdev -> shutdown )
1746
+ hdev -> shutdown (hdev );
1747
+ }
1748
+
1749
1749
/* flush cmd work */
1750
1750
flush_work (& hdev -> cmd_work );
1751
1751
You can’t perform that action at this time.
0 commit comments