---

yaml --- r: 291051 b: refs/heads/master c: b3fb611 h: refs/heads/master i: 291049: b7a1611 291047: 97b563e v: v3
git-mirror · Feb 23, 2012 · 71f1e55 · 71f1e55
1 parent 4e48c4f
commit 71f1e55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6be3655552ee49aa2b5fd20fa1b08f28d0feac86
+refs/heads/master: b3fb611ec7b76048cb14600e9a5a9b57e5d913da
diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c
@@ -125,15 +125,15 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int al
 
 	err = l2cap_chan_connect(chan, la.l2_psm, la.l2_cid, &la.l2_bdaddr);
 	if (err)
-		goto done;
+		return err;
 
 	lock_sock(sk);
 
 	err = bt_sock_wait_state(sk, BT_CONNECTED,
 			sock_sndtimeo(sk, flags & O_NONBLOCK));
-done:
-	if (sock_owned_by_user(sk))
-		release_sock(sk);
+
+	release_sock(sk);
+
 	return err;
 }