From dcd24c76f7a47112bd28d16ee2e51fe28d769be8 Mon Sep 17 00:00:00 2001
From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Date: Fri, 19 Aug 2011 21:06:52 -0300
Subject: [PATCH] --- yaml --- r: 266323 b: refs/heads/master c:
 454d48ff70c24930c6b0f9cb64f290fca2dfb271 h: refs/heads/master i:   266321:
 091b2649f6a83ac7471efa288136bc069aeb673b   266319:
 486c7962928848b81a0fae73b3498d45d6db15ab v: v3

---
 [refs]                                 | 2 +-
 trunk/include/net/bluetooth/hci_core.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 21ebf83bbd60..ae85d8dd075b 100644
--- 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
index 605829b2c63e..88566f2e0a6f 100644
--- 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);