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

Commit af202f84 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Fix quirks that are valid during setup driver callback 



For the quirks that are allow to be set during setup callback, the
check needs to be modified so that they are applied even if no
setup callback provided by the driver.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent eb1904f4

net/bluetooth/hci_core.c

+9 −2
Original line number Diff line number Diff line
@@ -2246,9 +2246,16 @@ static int hci_dev_do_open(struct hci_dev *hdev) 
	atomic_set(&hdev->cmd_cnt, 1);

	set_bit(HCI_INIT, &hdev->flags);



	if (hdev->setup && test_bit(HCI_SETUP, &hdev->dev_flags)) {

	if (test_bit(HCI_SETUP, &hdev->dev_flags)) {

		if (hdev->setup)

			ret = hdev->setup(hdev);



		/* The transport driver can set these quirks before

		 * creating the HCI device or in its setup callback.

		 *

		 * In case any of them is set, the controller has to

		 * start up as unconfigured.

		 */

		if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks) ||

		    test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks))

			set_bit(HCI_UNCONFIGURED, &hdev->dev_flags);