mirror of
https://github.com/brain-hackers/linux-brain.git
synced 2024-06-09 23:36:23 +09:00
Revert "Bluetooth: Move shutdown callback before flushing tx and rx queue"
This reverts commit abbcd61d09
.
Botched backport, dropping to reword for next release.
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
245f15a48c
commit
5f3ecbf4d5
|
@ -1691,14 +1691,6 @@ int hci_dev_do_close(struct hci_dev *hdev)
|
||||||
hci_request_cancel_all(hdev);
|
hci_request_cancel_all(hdev);
|
||||||
hci_req_sync_lock(hdev);
|
hci_req_sync_lock(hdev);
|
||||||
|
|
||||||
if (!hci_dev_test_flag(hdev, HCI_UNREGISTER) &&
|
|
||||||
!hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&
|
|
||||||
test_bit(HCI_UP, &hdev->flags)) {
|
|
||||||
/* Execute vendor specific shutdown routine */
|
|
||||||
if (hdev->shutdown)
|
|
||||||
hdev->shutdown(hdev);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {
|
if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {
|
||||||
cancel_delayed_work_sync(&hdev->cmd_timer);
|
cancel_delayed_work_sync(&hdev->cmd_timer);
|
||||||
hci_req_sync_unlock(hdev);
|
hci_req_sync_unlock(hdev);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user