commit 462bf76d294a480c775a040476bd7eb81f718ec2
author Peter Krystad <pkrystad@codeaurora.org> Mon Sep 19 14:20:20 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Tue Oct 11 09:59:24 2011 -0700
tree 2415547e0ec57a97f83eb0058ea723c86cbd1bd5
parent 5a9b2044d52a05379b71a67cbc12402b8c936fe6

Bluetooth: Guarantee BR-EDR device will be registered as hci0

Signed-off-by: Peter Krystad <pkrystad@codeaurora.org>

net/bluetooth/hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index ad88382..699284a 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1401,7 +1401,7 @@
 int hci_register_dev(struct hci_dev *hdev)
 {
 	struct list_head *head = &hci_dev_list, *p;
-	int i, id = 0;
+	int i, id;
 
 	BT_DBG("%p name %s bus %d owner %p", hdev, hdev->name,
 						hdev->bus, hdev->owner);
@@ -1409,6 +1409,8 @@
 	if (!hdev->open || !hdev->close || !hdev->destruct)
 		return -EINVAL;
 
+	id = (hdev->dev_type == HCI_BREDR) ? 0 : 1;
+
 	write_lock_bh(&hci_dev_list_lock);
 
 	/* Find first available device id */