---

yaml --- r: 291053 b: refs/heads/master c: 69775ff h: refs/heads/master i: 291051: 71f1e55 v: v3
git-mirror · Feb 23, 2012 · a00b8f5 · a00b8f5
1 parent dc19930
commit a00b8f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60fc5fb66efa0bcbe028637206ed59df8cd4ac19
+refs/heads/master: 69775ff6d101ccf435bd26ae822c24bbb20e11cf
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
@@ -194,6 +194,8 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
 
 	/* Reset all non-persistent flags */
 	hdev->dev_flags &= ~(BIT(HCI_LE_SCAN));
+
+	hdev->discovery.state = DISCOVERY_STOPPED;
 }
 
 static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb)