1 files changed, 5 insertions, 0 deletions

diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index f04c44146663..35e188c7a441 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -594,6 +594,7 @@ static void amp_mgr_destroy(struct kref *kref)
         list_del(&mgr->list);
         mutex_unlock(&amp_mgr_list_lock);
 
+        amp_ctrl_list_flush(mgr);
         kfree(mgr);
 }
 
@@ -630,6 +631,10 @@ static struct amp_mgr *amp_mgr_create(struct l2cap_conn *conn)
 
         kref_init(&mgr->kref);
 
+        /* Remote AMP ctrl list initialization */
+        INIT_LIST_HEAD(&mgr->amp_ctrls);
+        mutex_init(&mgr->amp_ctrls_lock);
+
         mutex_lock(&amp_mgr_list_lock);
         list_add(&mgr->list, &amp_mgr_list);
         mutex_unlock(&amp_mgr_list_lock);