diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-02-22 17:11:57 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-23 13:07:02 +0200 |
| commit | b3fb611ec7b76048cb14600e9a5a9b57e5d913da (patch) | |
| tree | a95447000d733686ff915dcd58d650140541f252 /net/bluetooth/l2cap_sock.c | |
| parent | 6be3655552ee49aa2b5fd20fa1b08f28d0feac86 (diff) | |
| download | kernel_goldelico_gta04-b3fb611ec7b76048cb14600e9a5a9b57e5d913da.zip kernel_goldelico_gta04-b3fb611ec7b76048cb14600e9a5a9b57e5d913da.tar.gz kernel_goldelico_gta04-b3fb611ec7b76048cb14600e9a5a9b57e5d913da.tar.bz2 | |
Bluetooth: Remove socket lock check
Simplify code so that we do not need to check whether socket is locked.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 73a06c1..52c94c7 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/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; } |