projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 96eff46)
Bluetooth: Remove unneeded local_amp_id initialization
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Thu, 15 Nov 2012 16:14:55 +0000 (18:14 +0200)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Mon, 19 Nov 2012 21:26:35 +0000 (19:26 -0200)
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>
net/bluetooth/l2cap_core.c patch | blob | blame | history

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 4479894e0a5a154731f665039bc1581910f21ce8..e4f52a7f08c6b90d46108be1ed16fc53d974ab96 100644 (file)
--- 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;