From 652126069aceaa135d2bedc422c70ac74e44e81d Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 15 Jan 2009 21:57:03 +0100
Subject: [PATCH] --- yaml --- r: 134716 b: refs/heads/master c:
 c89b6e6bda4c8021195778f47567d0cc9dbfe7ec h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c8580a78b621..ca85976dec06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71aeeaa1fd88fe7446391e0553336f0e0c2cfe6a
+refs/heads/master: c89b6e6bda4c8021195778f47567d0cc9dbfe7ec
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index f91ba690f5d2..beea9dbb6562 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -914,7 +914,8 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s
 	if (ev->status) {
 		hci_proto_connect_cfm(conn, ev->status);
 		hci_conn_del(conn);
-	}
+	} else if (ev->link_type != ACL_LINK)
+		hci_proto_connect_cfm(conn, ev->status);
 
 unlock:
 	hci_dev_unlock(hdev);