Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08add513 authored by Mat Martineau's avatar Mat Martineau Committed by Gustavo Padovan
Browse files

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



It's convenient to use the HCI device index the AMP controller id, but
the spec requires that an AMP controller never has id 0.

Signed-off-by: default avatarMat Martineau <mathewm@codeaurora.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Acked-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 8d5a04a1

net/bluetooth/hci_core.c

+6 −1
Original line number Diff line number Diff line
@@ -1410,7 +1410,7 @@ int hci_add_adv_entry(struct hci_dev *hdev, 
int hci_register_dev(struct hci_dev *hdev)

{

	struct list_head *head = &hci_dev_list, *p;

	int i, id = 0, error;

	int i, id, error;



	BT_DBG("%p name %s bus %d owner %p", hdev, hdev->name,

						hdev->bus, hdev->owner);
@@ -1418,6 +1418,11 @@ int hci_register_dev(struct hci_dev *hdev) 
	if (!hdev->open || !hdev->close || !hdev->destruct)

		return -EINVAL;



	/* Do not allow HCI_AMP devices to register at index 0,

	 * so the index can be used as the AMP controller ID.

	 */

	id = (hdev->dev_type == HCI_BREDR) ? 0 : 1;



	write_lock_bh(&hci_dev_list_lock);



	/* Find first available device id */