From b67a5f0a975e6e7d813046589c59ee6acdf2edfe Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 16 Sep 2021 10:48:22 +0200 Subject: [PATCH] 5.13-stable patches added patches: revert-bluetooth-move-shutdown-callback-before-flush.patch --- ...-move-shutdown-callback-before-flush.patch | 34 +++++++++++++++++++ queue-5.13/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 queue-5.13/revert-bluetooth-move-shutdown-callback-before-flush.patch diff --git a/queue-5.13/revert-bluetooth-move-shutdown-callback-before-flush.patch b/queue-5.13/revert-bluetooth-move-shutdown-callback-before-flush.patch new file mode 100644 index 00000000000..ed198bdd264 --- /dev/null +++ b/queue-5.13/revert-bluetooth-move-shutdown-callback-before-flush.patch @@ -0,0 +1,34 @@ +From b2b45e6d144afb5d97edec886539cd29838df54b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 Sep 2021 21:15:41 -0400 +Subject: 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 +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + net/bluetooth/hci_core.c | 8 -------- + 1 file changed, 8 deletions(-) + +--- a/net/bluetooth/hci_core.c ++++ b/net/bluetooth/hci_core.c +@@ -1740,14 +1740,6 @@ int hci_dev_do_close(struct hci_dev *hde + 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); diff --git a/queue-5.13/series b/queue-5.13/series index 5982f3f1d0e..aea122b476c 100644 --- a/queue-5.13/series +++ b/queue-5.13/series @@ -346,3 +346,4 @@ fix-array-index-out-of-bounds-in-taprio_change.patch net-w5100-check-return-value-after-calling-platform_.patch net-hns3-clean-up-a-type-mismatch-warning.patch kvm-arm64-vgic-move-irq-get_input_level-into-an-ops-.patch +revert-bluetooth-move-shutdown-callback-before-flush.patch -- 2.47.2