Commit 68253f3c authored by Zhengping Jiang's avatar Zhengping Jiang Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci_sync: Fix resuming scan after suspend resume 



After resuming, remove setting scanning_paused to false, because it is
checked and set to false in hci_resume_scan_sync. Also move setting
the value to false before updating passive scan, because the value is
used when resuming passive scan.

Fixes: 3b420553 (Bluetooth: hci_sync: Fix attempting to suspend with
unfiltered passive scan)

Signed-off-by: default avatarZhengping Jiang <jiangzp@google.com>
Reviewed-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent df332800

net/bluetooth/hci_sync.c

+2 −3
Original line number Diff line number Diff line
@@ -5063,13 +5063,13 @@ static int hci_resume_scan_sync(struct hci_dev *hdev) 
	if (!hdev->scanning_paused)

		return 0;



	hdev->scanning_paused = false;



	hci_update_scan_sync(hdev);



	/* Reset passive scanning to normal */

	hci_update_passive_scan_sync(hdev);



	hdev->scanning_paused = false;



	return 0;

}
@@ -5088,7 +5088,6 @@ int hci_resume_sync(struct hci_dev *hdev) 
		return 0;



	hdev->suspended = false;

	hdev->scanning_paused = false;



	/* Restore event mask */

	hci_set_event_mask_sync(hdev);