Commit 0e995280 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Marcel Holtmann
Browse files

Bluetooth: Clear suspend tasks on unregister 



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: 4e8c36c3 (Bluetooth: Fix suspend notifier race)
Signed-off-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent d33fe77b

net/bluetooth/hci_core.c

+11 −0
Original line number Diff line number Diff line
@@ -3442,6 +3442,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                                                              \
@@ -3785,6 +3795,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);