---

yaml --- r: 290955 b: refs/heads/master c: 7b99b65 h: refs/heads/master i: 290953: 78d43e5 290951: 6b3f7df v: v3
git-mirror · Feb 15, 2012 · cf15cfa · cf15cfa
1 parent b10c612
commit cf15cfa
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: 203159d486006a18fa1ccf787a10d15d3128cdac
+refs/heads/master: 7b99b659d90c5d421cb1867295c78a4c0c030734
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
@@ -380,7 +380,8 @@ void hci_discovery_set_state(struct hci_dev *hdev, int state)
 
 	switch (state) {
 	case DISCOVERY_STOPPED:
-		mgmt_discovering(hdev, 0);
+		if (hdev->discovery.state != DISCOVERY_STARTING)
+			mgmt_discovering(hdev, 0);
 		break;
 	case DISCOVERY_STARTING:
 		break;