diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-08-15 14:06:52 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-09-08 13:07:52 -0400 |
commit | b3ed6c63f7d4a51b01a61b10e53a2992ad26aa78 (patch) | |
tree | 93cb5de45872beaa90b572444bfecf827967c9fd /net/bluetooth | |
parent | 72c6fb915ff2d30ae14053edee4f0d30019bad76 (diff) |
Bluetooth: Remove unnecessary l2cap_chan_unlock before l2cap_chan_add
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 52b56808d5d3..777c41dbfdbe 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
@@ -7078,9 +7078,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, | |||
7078 | bacpy(&chan->src, &hcon->src); | 7078 | bacpy(&chan->src, &hcon->src); |
7079 | chan->src_type = bdaddr_type(hcon, hcon->src_type); | 7079 | chan->src_type = bdaddr_type(hcon, hcon->src_type); |
7080 | 7080 | ||
7081 | l2cap_chan_unlock(chan); | ||
7082 | l2cap_chan_add(conn, chan); | 7081 | l2cap_chan_add(conn, chan); |
7083 | l2cap_chan_lock(chan); | ||
7084 | 7082 | ||
7085 | /* l2cap_chan_add takes its own ref so we can drop this one */ | 7083 | /* l2cap_chan_add takes its own ref so we can drop this one */ |
7086 | hci_conn_drop(hcon); | 7084 | hci_conn_drop(hcon); |