From 942fa0996af97e8d3285676cc53973ff3833e3fb Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 14 Jul 2008 20:13:46 +0200
Subject: [PATCH] --- yaml --- r: 103659 b: refs/heads/master c:
 9dc0a3afc08d6c20c284994dcd84531787d00ec2 h: refs/heads/master i:   103657:
 ec2fb29c7ffcb5dbc2a21bf07a3844d4347c45d7   103655:
 39ce64def8a4b06fbbdfeef4813911eb70a3fae1 v: v3

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

diff --git a/[refs] b/[refs]
index 68208db7942c..1adbe39c3dc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae29319649b80ed9d28d7b4f164e3f5f75020fc8
+refs/heads/master: 9dc0a3afc08d6c20c284994dcd84531787d00ec2
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index 0aba21a03b3c..6bc5a0506c6c 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -1314,8 +1314,16 @@ static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_bu
 	hci_dev_lock(hdev);
 
 	conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr);
-	if (!conn)
-		goto unlock;
+	if (!conn) {
+		if (ev->link_type == ESCO_LINK)
+			goto unlock;
+
+		conn = hci_conn_hash_lookup_ba(hdev, ESCO_LINK, &ev->bdaddr);
+		if (!conn)
+			goto unlock;
+
+		conn->type = SCO_LINK;
+	}
 
 	if (!ev->status) {
 		conn->handle = __le16_to_cpu(ev->handle);