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:51:23 +0200 |
| commit | d3c3f4e07826acf1ddcdca44057927e3a1ca3072 (patch) | |
| tree | bd74c30a3e9d9f18d3706f3103ae2fecaaa984c6 | |
| parent | c31c2cca229aa5280d108618bb264c713840a4c2 (diff) | |
| download | linux-stable-d3c3f4e07826acf1ddcdca44057927e3a1ca3072.tar.gz linux-stable-d3c3f4e07826acf1ddcdca44057927e3a1ca3072.tar.bz2 linux-stable-d3c3f4e07826acf1ddcdca44057927e3a1ca3072.zip | |
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>
| -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 a9097fb7eb82..2ad66f64879f 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -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); |