mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
Bluetooth: delete a stray unlock
commitdf66499a1f
upstream. We used to take a lock in amp_physical_cfm() but then we moved it to the caller function. Unfortunately the unlock on this error path was overlooked so it leads to a double unlock. Fixes:a514b17fab
("Bluetooth: Refactor locking in amp_physical_cfm") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a0a5f3d36b
commit
cf223ff1a2
1 changed files with 1 additions and 3 deletions
|
@ -4918,10 +4918,8 @@ void __l2cap_physical_cfm(struct l2cap_chan *chan, int result)
|
|||
BT_DBG("chan %p, result %d, local_amp_id %d, remote_amp_id %d",
|
||||
chan, result, local_amp_id, remote_amp_id);
|
||||
|
||||
if (chan->state == BT_DISCONN || chan->state == BT_CLOSED) {
|
||||
l2cap_chan_unlock(chan);
|
||||
if (chan->state == BT_DISCONN || chan->state == BT_CLOSED)
|
||||
return;
|
||||
}
|
||||
|
||||
if (chan->state != BT_CONNECTED) {
|
||||
l2cap_do_create(chan, result, local_amp_id, remote_amp_id);
|
||||
|
|
Loading…
Reference in a new issue