Commit 6fb00d4e authored by Manish Mandlik's avatar Manish Mandlik Committed by Marcel Holtmann
Browse files

Bluetooth: Check scan state before disabling during suspend 



Check current scan state by checking HCI_LE_SCAN flag and send scan
disable command only if scan is already enabled.

Signed-off-by: default avatarManish Mandlik <mmandlik@google.com>
Reviewed-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Reviewed-by: default avatarAlain Michaud <alainm@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 00eb0cb3

net/bluetooth/hci_request.c

+6 −4
Original line number Diff line number Diff line
@@ -998,7 +998,8 @@ static void hci_req_set_event_filter(struct hci_request *req) 


static void hci_req_config_le_suspend_scan(struct hci_request *req)

{

	/* Can't change params without disabling first */

	/* Before changing params disable scan if enabled */

	if (hci_dev_test_flag(req->hdev, HCI_LE_SCAN))

		hci_req_add_le_scan_disable(req);



	/* Configure params and enable scanning */
@@ -1065,7 +1066,8 @@ void hci_req_prepare_suspend(struct hci_dev *hdev, enum suspended_state next) 
		page_scan = SCAN_DISABLED;

		hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE, 1, &page_scan);



		/* Disable LE passive scan */

		/* Disable LE passive scan if enabled */

		if (hci_dev_test_flag(hdev, HCI_LE_SCAN))

			hci_req_add_le_scan_disable(&req);



		/* Mark task needing completion */