From 3be6528a0e7f6e6de4b3995cbbc7e6b0e8ff36aa Mon Sep 17 00:00:00 2001
From: Peter Hurley <peter@hurleysoftware.com>
Date: Fri, 5 Aug 2011 10:51:50 -0400
Subject: [PATCH] --- yaml --- r: 263531 b: refs/heads/master c:
 615aedd6e5add8104f031b0d547285652d04d330 h: refs/heads/master i:   263529:
 62a7863a25ea367ca72b859a9286378c115bf212   263527:
 f7c0e32a98d08838c9cda41a96cb7bd8c0abc373 v: v3

---
 [refs]                          | 2 +-
 trunk/net/bluetooth/hidp/core.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a210d86bd08f..390f7fd93620 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c97e94c0b7c56319754ee6f9ccd2e93fe1ee2b3
+refs/heads/master: 615aedd6e5add8104f031b0d547285652d04d330
diff --git a/trunk/net/bluetooth/hidp/core.c b/trunk/net/bluetooth/hidp/core.c
index 26f0d109ff41..a859f9078df6 100644
--- a/trunk/net/bluetooth/hidp/core.c
+++ b/trunk/net/bluetooth/hidp/core.c
@@ -842,6 +842,8 @@ static int hidp_setup_input(struct hidp_session *session,
 
 	err = input_register_device(input);
 	if (err < 0) {
+		input_free_device(input);
+		session->input = NULL;
 		hci_conn_put_device(session->conn);
 		return err;
 	}
@@ -1089,7 +1091,6 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
 failed:
 	up_write(&hidp_session_sem);
 
-	input_free_device(session->input);
 	kfree(session);
 	return err;
 }