summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorVille Tervo <ville.tervo@nokia.com>2011-04-07 14:59:50 +0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-18 20:11:45 -0300
commit7a74aeb022b34a8fa8ef00545e66cf0568b5ddf6 (patch)
tree82a938a29207cdc7908c450b9a907dad00b316c9 /net
parent332704a51498a7e29aa92c19dc03f11f80b71bfe (diff)
downloadlinux-7a74aeb022b34a8fa8ef00545e66cf0568b5ddf6.tar.gz
linux-7a74aeb022b34a8fa8ef00545e66cf0568b5ddf6.tar.bz2
linux-7a74aeb022b34a8fa8ef00545e66cf0568b5ddf6.zip
Bluetooth: Fix refcount balance for hci connection
hci_io_capa_reply_evt() holds reference for hciconnection. It's useless since hci_io_capa_request_evt()/hci_simple_pair_complete_evt() already protects the connection. In addition it leaves connection open after failed SSP pairing. Signed-off-by: Ville Tervo <ville.tervo@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index cebe7588469f..b2570159a044 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2387,8 +2387,6 @@ static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *s
if (!conn)
goto unlock;
- hci_conn_hold(conn);
-
conn->remote_cap = ev->capability;
conn->remote_oob = ev->oob_data;
conn->remote_auth = ev->authentication;