Skip to content

Commit

Permalink
Revert "Bluetooth: Move shutdown callback before flushing tx and rx q…
Browse files Browse the repository at this point in the history
…ueue"

This reverts commit 4711284.

Botched backport, dropping to rework for next release.

Reported-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Sasha Levin authored and gregkh committed Sep 16, 2021
1 parent c31c2cc commit d3c3f4e
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions net/bluetooth/hci_core.c
Expand Up @@ -1732,14 +1732,6 @@ int hci_dev_do_close(struct hci_dev *hdev)
hci_request_cancel_all(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)) {
cancel_delayed_work_sync(&hdev->cmd_timer);
hci_req_sync_unlock(hdev);
Expand Down

0 comments on commit d3c3f4e

Please sign in to comment.