Fixes for 5.10

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/revert-bluetooth-move-shutdown-callback-before-flush.patch b/queue-5.10/revert-bluetooth-move-shutdown-callback-before-flush.patch
new file mode 100644 (file)
index 0000000..b95f0fd
--- /dev/null
+++ b/queue-5.10/revert-bluetooth-move-shutdown-callback-before-flush.patch
@@ -0,0 +1,38 @@
+From b2b45e6d144afb5d97edec886539cd29838df54b Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+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 <pavel@denx.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ net/bluetooth/hci_core.c | 8 --------
+ 1 file changed, 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);
+-- 
+2.30.2
+

diff --git a/queue-5.10/series b/queue-5.10/series
index 4d73438c1e5520b505c2f4a7c557c944a93a46c4..80d8baff85a9688eb25a098455697a10762e76ac 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -52,3 +52,4 @@ pci-aardvark-configure-pcie-resources-from-ranges-dt-property.patch
 pci-export-pci_pio_to_address-for-module-use.patch
 pci-aardvark-fix-checking-for-pio-status.patch
 pci-aardvark-fix-masking-and-unmasking-legacy-intx-interrupts.patch
+revert-bluetooth-move-shutdown-callback-before-flush.patch