Commit 3eec158d authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Marcel Holtmann
Browse files

Bluetooth: Re-order clearing suspend tasks 



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: 0e995280 (Bluetooth: Clear suspend tasks on unregister)
Signed-off-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent c6db0143

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -3794,8 +3794,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);