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

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
...@@ -998,8 +998,9 @@ static void hci_req_set_event_filter(struct hci_request *req) ...@@ -998,8 +998,9 @@ static void hci_req_set_event_filter(struct hci_request *req)
static void hci_req_config_le_suspend_scan(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 */
hci_req_add_le_scan_disable(req); if (hci_dev_test_flag(req->hdev, HCI_LE_SCAN))
hci_req_add_le_scan_disable(req);
/* Configure params and enable scanning */ /* Configure params and enable scanning */
hci_req_add_le_passive_scan(req); hci_req_add_le_passive_scan(req);
...@@ -1065,8 +1066,9 @@ void hci_req_prepare_suspend(struct hci_dev *hdev, enum suspended_state next) ...@@ -1065,8 +1066,9 @@ void hci_req_prepare_suspend(struct hci_dev *hdev, enum suspended_state next)
page_scan = SCAN_DISABLED; page_scan = SCAN_DISABLED;
hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE, 1, &page_scan); hci_req_add(&req, HCI_OP_WRITE_SCAN_ENABLE, 1, &page_scan);
/* Disable LE passive scan */ /* Disable LE passive scan if enabled */
hci_req_add_le_scan_disable(&req); if (hci_dev_test_flag(hdev, HCI_LE_SCAN))
hci_req_add_le_scan_disable(&req);
/* Mark task needing completion */ /* Mark task needing completion */
set_bit(SUSPEND_SCAN_DISABLE, hdev->suspend_tasks); set_bit(SUSPEND_SCAN_DISABLE, hdev->suspend_tasks);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment