From e7301edf449b5c13ead4b3116e630d9e86b61ef1 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 9 May 2009 12:04:08 -0700
Subject: [PATCH] --- yaml --- r: 145042 b: refs/heads/master c:
 1b0336bb36f88976f1210a65b62f6a3e9578ee7b h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_conn.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 29687ed90f4c..c3b719f7c7f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 384943ec1bb462e410390ad8f108ff1474cd882d
+refs/heads/master: 1b0336bb36f88976f1210a65b62f6a3e9578ee7b
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index 85a1c6be2db9..fa47d5d84f5c 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -171,10 +171,8 @@ static void hci_conn_timeout(unsigned long arg)
 	switch (conn->state) {
 	case BT_CONNECT:
 	case BT_CONNECT2:
-		if (conn->type == ACL_LINK)
+		if (conn->type == ACL_LINK && conn->out)
 			hci_acl_connect_cancel(conn);
-		else
-			hci_acl_disconn(conn, 0x13);
 		break;
 	case BT_CONFIG:
 	case BT_CONNECTED: