Bluetooth: Clear suspend tasks on unregister

[ Upstream commit 0e9952804ec9c8ba60f131225eab80634339f042 ]

While unregistering, make sure to clear the suspend tasks before
cancelling the work. If the unregister is called during resume from
suspend, this will unnecessarily add 2s to the resume time otherwise.

Fixes: 4e8c36c3b0d73d (Bluetooth: Fix suspend notifier race)
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index fc28dc201b9365878938bebaf44d174222dd2a3b..0f4e5a31f983ca1b56c69d1282bbd235b3b33abf 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3280,6 +3280,16 @@ void hci_copy_identity_address(struct hci_dev *hdev, bdaddr_t *bdaddr,
        }
 }
 
+static void hci_suspend_clear_tasks(struct hci_dev *hdev)
+{
+       int i;
+
+       for (i = 0; i < __SUSPEND_NUM_TASKS; i++)
+               clear_bit(i, hdev->suspend_tasks);
+
+       wake_up(&hdev->suspend_wait_q);
+}
+
 static int hci_suspend_wait_event(struct hci_dev *hdev)
 {
 #define WAKE_COND                                                              \
@@ -3609,6 +3619,7 @@ void hci_unregister_dev(struct hci_dev *hdev)
        cancel_work_sync(&hdev->power_on);
 
        unregister_pm_notifier(&hdev->suspend_notifier);
+       hci_suspend_clear_tasks(hdev);
        cancel_work_sync(&hdev->suspend_prepare);
 
        hci_dev_do_close(hdev);