---

yaml --- r: 266323 b: refs/heads/master c: 454d48f h: refs/heads/master i: 266321: 091b264 266319: 486c796 v: v3
git-mirror · Sep 21, 2011 · dcd24c7 · dcd24c7
1 parent 5167dd1
commit dcd24c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d26a23454813908a1bf0e2fd8c73233b22c6dbd7
+refs/heads/master: 454d48ff70c24930c6b0f9cb64f290fca2dfb271
diff --git a/trunk/include/net/bluetooth/hci_core.h b/trunk/include/net/bluetooth/hci_core.h
@@ -492,7 +492,7 @@ static inline void hci_conn_put(struct hci_conn *conn)
 {
 	if (atomic_dec_and_test(&conn->refcnt)) {
 		unsigned long timeo;
-		if (conn->type == ACL_LINK) {
+		if (conn->type == ACL_LINK || conn->type == LE_LINK) {
 			del_timer(&conn->idle_timer);
 			if (conn->state == BT_CONNECTED) {
 				timeo = msecs_to_jiffies(conn->disc_timeout);