Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / net / bluetooth / amp.c

diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
index 4b2fea6c1c2a6b5fe7aa2da34eefb8a2acfcc404..1b0d92c0643a97595ea2ad44e69f2cf45b96a852 100644 (file)
--- a/net/bluetooth/amp.c
+++ b/net/bluetooth/amp.c
@@ -386,13 +386,17 @@ void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon)
 
        bredr_chan = mgr->bredr_chan;
 
+       l2cap_chan_lock(bredr_chan);
+
        set_bit(FLAG_EFS_ENABLE, &bredr_chan->flags);
        bredr_chan->remote_amp_id = hs_hcon->remote_id;
+       bredr_chan->local_amp_id = hs_hcon->hdev->id;
        bredr_chan->hs_hcon = hs_hcon;
        bredr_chan->conn->mtu = hs_hcon->hdev->block_mtu;
-       bredr_chan->fcs = L2CAP_FCS_NONE;
 
-       l2cap_physical_cfm(bredr_chan, 0);
+       __l2cap_physical_cfm(bredr_chan, 0);
+
+       l2cap_chan_unlock(bredr_chan);
 
        hci_dev_put(bredr_hdev);
 }