diff options
| author | Sasha Levin <sashal@kernel.org> | 2021-09-15 21:15:41 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-16 12:30:15 +0200 |
| commit | 25a6c6d58e220035ff1d3e5f2a4e099c304ef55c (patch) | |
| tree | b60411b1fce08a0409c1e7367f30bbe0f5c4ae39 | |
| parent | e228609749a14bb736b6210738042a3c0a2127d1 (diff) | |
Revert "Bluetooth: Move shutdown callback before flushing tx and rx queue"
This reverts commit 471128476819777a7b71f2b90bc868ccf74b185f.
Botched backport, dropping to rework for next release.
Reported-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/bluetooth/hci_core.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index bf1bb08b94aa..8d455c232154 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1740,14 +1740,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); |