X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=net%2Fbluetooth%2Fl2cap.c;h=34f8bf98bc0529b4d69f7c60ff6f739ed63077a3;hb=8e8440f53593b5f9c695f18b493b535873dbb9da;hp=7c5459c8e8efdf9e7e9e51d485c9f9ff99eb20f9;hpb=7e36763b2c204d59de4e88087f84a2c0c8421f25;p=firefly-linux-kernel-4.4.55.git

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 7c5459c8e8ef..34f8bf98bc05 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -417,7 +417,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
 		l2cap_sock_kill(sk);
 	}
 
-	del_timer_sync(&conn->info_timer);
+	if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_SENT)
+		del_timer_sync(&conn->info_timer);
 
 	hcon->l2cap_data = NULL;
 	kfree(conn);