---

yaml --- r: 306832 b: refs/heads/master c: bc3dd33 h: refs/heads/master v: v3
git-mirror · May 9, 2012 · 7fbbdb2 · 7fbbdb2
1 parent 8e18ccb
commit 7fbbdb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 097db76cdccd8107784e2c845b838ab333be02dc
+refs/heads/master: bc3dd33cef001e61da0f71b5d8f918b3dbaa4a94
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
@@ -1098,7 +1098,8 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev,
 
 		schedule_delayed_work(&hdev->adv_work, ADV_CLEAR_TIMEOUT);
 
-		if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED) {
+		if (hdev->discovery.type == DISCOV_TYPE_INTERLEAVED &&
+		    hdev->discovery.state == DISCOVERY_FINDING) {
 			mgmt_interleaved_discovery(hdev);
 		} else {
 			hci_dev_lock(hdev);