aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2011-08-05 10:52:01 -0400
committerJaikumar Ganesh <jaikumar@google.com>2011-08-11 18:42:58 -0700
commit3bded00785e6c763e82afa989a17402f84a8cc4c (patch)
treee96e0df08bc657641af91581f0489242945d1023 /net/bluetooth
parente5e416a4151ee182a05bb3cbbbda8f4d54e83400 (diff)
downloadkernel_samsung_aries-3bded00785e6c763e82afa989a17402f84a8cc4c.zip
kernel_samsung_aries-3bded00785e6c763e82afa989a17402f84a8cc4c.tar.gz
kernel_samsung_aries-3bded00785e6c763e82afa989a17402f84a8cc4c.tar.bz2
Bluetooth: hidp: Don't release device ref if never held
When an hidp connection is added for a boot protocol input device, don't release a device reference that was never acquired. The device reference is acquired when the session is linked to the session list (which hasn't happened yet when hidp_setup_input is called). Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hidp/core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index a859f90..fb68f34 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -844,7 +844,6 @@ static int hidp_setup_input(struct hidp_session *session,
if (err < 0) {
input_free_device(input);
session->input = NULL;
- hci_conn_put_device(session->conn);
return err;
}