---

yaml --- r: 86461 b: refs/heads/master c: 3ab2273 h: refs/heads/master i: 86459: de5fed6 v: v3
git-mirror · Feb 27, 2008 · 642023d · 642023d
1 parent 394aa82
commit 642023d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);
 }