diff options
| author | Sasha Levin <sashal@kernel.org> | 2021-09-16 04:16:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-16 13:56:13 +0300 |
| commit | 5f3ecbf4d586b0e78c6399c4f6bbd9dcd4fd6fa0 (patch) | |
| tree | 7076c7bd11be585a2d94a2451d9aac75e73c8a35 /net | |
| parent | 245f15a48cdc4d5a90902e140392dc151e528ab8 (diff) | |
| download | linux-5f3ecbf4d586b0e78c6399c4f6bbd9dcd4fd6fa0.tar.xz | |
Revert "Bluetooth: Move shutdown callback before flushing tx and rx queue"
This reverts commit abbcd61d091f69ec98013dc0ae9c992e152fc303.
Botched backport, dropping to reword for next release.
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -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 bdd330527cfa..c50e3e8afbd3 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1691,14 +1691,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); |