summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Emeltchenko2012-11-15 17:14:55 +0100
committerGustavo Padovan2012-11-19 22:26:35 +0100
commit522db70286fcce420e5fc1be107912fbd3806323 (patch)
tree5f7e5fad4a4524421974f0cba35f44a0c9fac43f
parentBluetooth: Use __l2cap_no_conn_pending helper (diff)
downloadkernel-qcow2-linux-522db70286fcce420e5fc1be107912fbd3806323.tar.gz
kernel-qcow2-linux-522db70286fcce420e5fc1be107912fbd3806323.tar.xz
kernel-qcow2-linux-522db70286fcce420e5fc1be107912fbd3806323.zip
Bluetooth: Remove unneeded local_amp_id initialization
local_amp_id is already set in l2cap_connect() which is called several lines above. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r--net/bluetooth/l2cap_core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 4479894e0a5a..e4f52a7f08c6 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4284,7 +4284,6 @@ static int l2cap_create_channel_req(struct l2cap_conn *conn,
BT_DBG("mgr %p bredr_chan %p hs_hcon %p", mgr, chan, hs_hcon);
- chan->local_amp_id = req->amp_id;
mgr->bredr_chan = chan;
chan->hs_hcon = hs_hcon;
conn->mtu = hdev->block_mtu;