1 files changed, 3 insertions, 0 deletions

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index cb36169ef300..2d550afe4322 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1640,6 +1640,9 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
 
         l2cap_unregister_all_users(conn);
 
+        /* Force the connection to be immediately dropped */
+        hcon->disc_timeout = 0;
+
         mutex_lock(&conn->chan_lock);
 
         /* Kill channels */