---

yaml --- r: 134716 b: refs/heads/master c: c89b6e6 h: refs/heads/master v: v3
git-mirror · Feb 27, 2009 · 6521260 · 6521260
1 parent bb79b38
commit 6521260
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);