Fixes for 5.4

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

diff --git a/queue-5.4/revert-bluetooth-move-shutdown-callback-before-flush.patch b/queue-5.4/revert-bluetooth-move-shutdown-callback-before-flush.patch
new file mode 100644 (file)
index 0000000..a3d2994
--- /dev/null
+++ b/queue-5.4/revert-bluetooth-move-shutdown-callback-before-flush.patch
@@ -0,0 +1,38 @@
+From b80fc3a7de116027e9edb2c1ce58bb4361005540 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 15 Sep 2021 21:16:27 -0400
+Subject: 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>
+---
+ 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 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);
+-- 
+2.30.2
+

diff --git a/queue-5.4/series b/queue-5.4/series
index 4bf7c8a93af7a5014df5b80fccb47c3b1f1da0a6..fa9e75560133344fc287701ebdf7069addd12f98 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -35,3 +35,4 @@ pci-xilinx-nwl-enable-the-clock-through-ccf.patch
 pci-aardvark-fix-checking-for-pio-status.patch
 pci-aardvark-increase-polling-delay-to-1.5s-while-waiting-for-pio-response.patch
 pci-aardvark-fix-masking-and-unmasking-legacy-intx-interrupts.patch
+revert-bluetooth-move-shutdown-callback-before-flush.patch