From 958c11387dcf6f2e0f786f899077468a6f5e8a88 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 9 May 2009 12:09:21 -0700 Subject: [PATCH] --- yaml --- r: 145043 b: refs/heads/master c: 3d7a9d1c7ee251a04095d43eec5a3f4ff3f710a8 h: refs/heads/master i: 145041: 4218c8b6473d9a429524ac62c507711f15f522cb 145039: cef210d6522e915a763c22e2cb65d92685006151 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c3b719f7c7f0..10b855c9b514 100644 --- 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 index 4e7cb88e5da9..184ba0a88ec0 100644 --- 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);