From 4f99ade257ab324de6cb7fa29495a99684293e64 Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Thu, 15 Nov 2012 18:14:55 +0200
Subject: [PATCH] --- yaml --- r: 341541 b: refs/heads/master c:
 522db70286fcce420e5fc1be107912fbd3806323 h: refs/heads/master i:   341539:
 db8c9ae454b38e3c7c1613be78cb6258acb22c1f v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_core.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4a99a3d8255b..a0e9782c983b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96eff46e9f5632efa0d2941f7e028701a5f1a0f6
+refs/heads/master: 522db70286fcce420e5fc1be107912fbd3806323
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index 4479894e0a5a..e4f52a7f08c6 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/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;