---

yaml --- r: 263531 b: refs/heads/master c: 615aedd h: refs/heads/master i: 263529: 62a7863 263527: f7c0e32 v: v3
git-mirror · Aug 11, 2011 · 3be6528 · 3be6528
1 parent e6a4edb
commit 3be6528
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 }