---

yaml --- r: 145043 b: refs/heads/master c: 3d7a9d1 h: refs/heads/master i: 145041: 4218c8b 145039: cef210d v: v3
git-mirror · May 10, 2009 · 958c113 · 958c113
1 parent e7301ed
commit 958c113
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: 1b0336bb36f88976f1210a65b62f6a3e9578ee7b
+refs/heads/master: 3d7a9d1c7ee251a04095d43eec5a3f4ff3f710a8
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
@@ -1493,7 +1493,7 @@ static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff
 	hci_dev_lock(hdev);
 
 	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
-	if (conn) {
+	if (conn && conn->state == BT_CONNECTED) {
 		hci_conn_hold(conn);
 		conn->disc_timeout = HCI_PAIRING_TIMEOUT;
 		hci_conn_put(conn);