From 10a2cd372c9855a8e2518f4c4aabf575315cb66e Mon Sep 17 00:00:00 2001 From: Waldemar Rymarkiewicz Date: Fri, 23 Sep 2011 10:01:30 +0200 Subject: [PATCH] --- yaml --- r: 266651 b: refs/heads/master c: b6f98044a6cbeba8234a3d433d715e9ef36880c4 h: refs/heads/master i: 266649: 641503d486a0633bc097194cf973631071e34aad 266647: deddf2418dd943df8c636cee0b8ce76132363833 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_event.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cadf5eaacdbe..bc8fe787b886 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67c9e840a098fa62c0b464387160ff8f52a7ef4a +refs/heads/master: b6f98044a6cbeba8234a3d433d715e9ef36880c4 diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c index 35083f2aa2ea..7390ba9d4f6e 100644 --- a/trunk/net/bluetooth/hci_event.c +++ b/trunk/net/bluetooth/hci_event.c @@ -2174,7 +2174,10 @@ 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 && conn->state == BT_CONNECTED) { + if (!conn) + goto unlock; + + if (conn->state == BT_CONNECTED) { hci_conn_hold(conn); conn->disc_timeout = HCI_PAIRING_TIMEOUT; hci_conn_put(conn); @@ -2194,6 +2197,7 @@ static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff mgmt_pin_code_request(hdev->id, &ev->bdaddr, secure); } +unlock: hci_dev_unlock(hdev); }