Commit df66499a authored Nov 19, 2019 by Dan Carpenter Committed by Marcel Holtmann Nov 19, 2019

Bluetooth: delete a stray unlock



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: a514b17f ("Bluetooth: Refactor locking in amp_physical_cfm")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent b8dc6476

net/bluetooth/l2cap_core.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -4936,10 +4936,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);

Admin message