From 642023de3bf1f4be6a26072446890f807ac49761 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 26 Feb 2008 17:42:56 -0800
Subject: [PATCH] --- yaml --- r: 86461 b: refs/heads/master c:
 3ab2273175bd59616b6e85c0f88b154e8bd97413 h: refs/heads/master i:   86459:
 de5fed6cfc831e9080355d57c00523d07d367815 v: v3

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

diff --git a/[refs] b/[refs]
index 9b61d9a3637e..99628cc214af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f2f40a92e007ec5b503db20f3f70cb331c64f65
+refs/heads/master: 3ab2273175bd59616b6e85c0f88b154e8bd97413
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index a8811c0a0cea..7c5459c8e8ef 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -417,6 +417,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
 		l2cap_sock_kill(sk);
 	}
 
+	del_timer_sync(&conn->info_timer);
+
 	hcon->l2cap_data = NULL;
 	kfree(conn);
 }