1 files changed, 6 insertions, 3 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7451a9c92d9d..df22efcfcc0b 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -316,10 +316,13 @@ 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) {
-                        timeo = msecs_to_jiffies(HCI_DISCONN_TIMEOUT);
-                        if (!conn->out)
-                                timeo *= 2;
                         del_timer(&conn->idle_timer);
+                        if (conn->state == BT_CONNECTED) {
+                                timeo = msecs_to_jiffies(HCI_DISCONN_TIMEOUT);
+                                if (!conn->out)
+                                        timeo *= 2;
+                        } else
+                                timeo = msecs_to_jiffies(10);
                 } else
                         timeo = msecs_to_jiffies(10);
                 mod_timer(&conn->disc_timer, jiffies + timeo);