Bluetooth: Re-order clearing suspend tasks

[ Upstream commit 3eec158d5eca7dd455118d9e00568aad2371219f ]

Unregister_pm_notifier is a blocking call so suspend tasks should be
cleared beforehand. Otherwise, the notifier will wait for completion
before returning (and we encounter a 2s timeout on resume).

Fixes: 0e9952804ec9c8 (Bluetooth: Clear suspend tasks on unregister)
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 0f4e5a31f983ca1b56c69d1282bbd235b3b33abf..131d29e902a30bb38c14b62a906cb2832267d06d 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3618,8 +3618,8 @@ 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);
+       unregister_pm_notifier(&hdev->suspend_notifier);
        cancel_work_sync(&hdev->suspend_prepare);
 
        hci_dev_do_close(hdev);