[PATCH 3/6] bluetooth: delete timer in l2cap_conn_del()

[Andres Salomon]

From: Thomas Gleixner <tglx at linutronix.de>

Delete a possibly armed timer before kfree'ing the connection object.

Solves: http://lkml.org/lkml/2008/2/15/514

Reported-by:Quel Qun <kelk1 at comcast.net>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Andres Salomon <dilinger at canonical.com>
---
 net/bluetooth/l2cap.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 477e052..e165c9b 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -426,6 +426,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);
 }
-- 
1.5.6.5