Bluetooth: Remove unnecessary l2cap_chan_unlock before l2cap_chan_add
authorJohan Hedberg <johan.hedberg@intel.com>
Fri, 15 Aug 2014 18:06:52 +0000 (21:06 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 8 Sep 2014 17:07:52 +0000 (19:07 +0200)
The l2cap_chan_add() function doesn't require the channel to be
unlocked. It only requires the l2cap_conn to be unlocked. Therefore,
it's unnecessary to unlock a channel before calling l2cap_chan_add().
This patch removes such unnecessary unlocking from the
l2cap_chan_connect() function.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/l2cap_core.c

index 52b56808d5d3d11e74a96b3d7708ded11e269288..777c41dbfdbe0b38e5c5a97bcf4ac0046570bbd8 100644 (file)
@@ -7078,9 +7078,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
        bacpy(&chan->src, &hcon->src);
        chan->src_type = bdaddr_type(hcon, hcon->src_type);
 
-       l2cap_chan_unlock(chan);
        l2cap_chan_add(conn, chan);
-       l2cap_chan_lock(chan);
 
        /* l2cap_chan_add takes its own ref so we can drop this one */
        hci_conn_drop(hcon);