From 87664a4f55cda95476b44228d0ecc237fe0ad180 Mon Sep 17 00:00:00 2001
From: Dave Young <hidave.darkstar@gmail.com>
Date: Mon, 3 Mar 2008 12:18:55 -0800
Subject: [PATCH] --- yaml --- r: 86905 b: refs/heads/master c:
 8e8440f53593b5f9c695f18b493b535873dbb9da h: refs/heads/master i:   86903:
 f00ce2479598f98baab0d0fe1c1f53d05db0e17f v: v3

---
 [refs]                      | 2 +-
 trunk/net/bluetooth/l2cap.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ca1fc990a866..859f5e09d626 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e36763b2c204d59de4e88087f84a2c0c8421f25
+refs/heads/master: 8e8440f53593b5f9c695f18b493b535873dbb9da
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 7c5459c8e8ef..34f8bf98bc05 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/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);