Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[sfrench/cifs-2.6.git] / net / bluetooth / l2cap_core.c

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index da7fdbdf9c41af026969f6045513d3e7685434bc..a845786258a0bf4c3fa6180b5c84b3d8feec5ef4 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -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);