---

yaml --- r: 291090 b: refs/heads/master c: 9f8ce96 h: refs/heads/master v: v3
git-mirror · Mar 2, 2012 · 97e485b · 97e485b
1 parent 31d52ec
commit 97e485b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17b02e625662906f370a3eb5e7495cf06ed7d4a4
+refs/heads/master: 9f8ce967caed427f78d00bb6b07d79cb040a88bd
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
@@ -193,7 +193,7 @@ static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb)
 	hci_req_complete(hdev, HCI_OP_RESET, status);
 
 	/* Reset all non-persistent flags */
-	hdev->dev_flags &= ~(BIT(HCI_LE_SCAN));
+	hdev->dev_flags &= ~(BIT(HCI_LE_SCAN) | BIT(HCI_PENDING_CLASS));
 
 	hdev->discovery.state = DISCOVERY_STOPPED;
 }