From: Peter Hurley <peter@hurleysoftware.com>
Date: Fri, 5 Aug 2011 14:52:01 +0000 (-0400)
Subject: Bluetooth: hidp: Don't release device ref if never held
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ff062ea109217329b88693bc9081da893eb8b71b;p=deliverable%2Flinux.git

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>
---

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index a859f9078df6..fb68f344c34a 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;
 	}