From 71f1e55ed6f65b2768bfb340681017642029eb0c Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Wed, 22 Feb 2012 17:11:57 +0200
Subject: [PATCH] --- yaml --- r: 291051 b: refs/heads/master c:
 b3fb611ec7b76048cb14600e9a5a9b57e5d913da h: refs/heads/master i:   291049:
 b7a1611a3dbfe90f040469bdff3058782a7fc544   291047:
 97b563eb1779462c7ffff5a777a96cbc3fb5a10d v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_sock.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2cdfb66c6e6b..8b2b2d0821a2 100644
--- 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
index 73a06c1b0cd7..52c94c765779 100644
--- 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;
 }