Skip to content

Commit f8c51d2

Browse files
jwrdegoedeholtmann
authored andcommitted
Bluetooth: btbcm: Move setting of USE_BDADDR_PROPERTY quirk to hci_bcm.c
btbcm_finalize() is currently only used by UART attached BCM devices. Move the setting of the USE_BDADDR_PROPERTY quirk, which we only want for UART attached devices to hci_bcm in preparation for using btbcm_finalize() for USB attached devices too. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
1 parent 3fef10e commit f8c51d2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

drivers/bluetooth/btbcm.c

-6
Original file line numberDiff line numberDiff line change
@@ -488,12 +488,6 @@ int btbcm_finalize(struct hci_dev *hdev)
488488

489489
set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
490490

491-
/* Some devices ship with the controller default address.
492-
* Allow the bootloader to set a valid address through the
493-
* device tree.
494-
*/
495-
set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
496-
497491
return 0;
498492
}
499493
EXPORT_SYMBOL_GPL(btbcm_finalize);

drivers/bluetooth/hci_bcm.c

+6
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,12 @@ static int bcm_setup(struct hci_uart *hu)
623623
if (err)
624624
return err;
625625

626+
/* Some devices ship with the controller default address.
627+
* Allow the bootloader to set a valid address through the
628+
* device tree.
629+
*/
630+
set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hu->hdev->quirks);
631+
626632
if (!bcm_request_irq(bcm))
627633
err = bcm_setup_sleep(hu);
628634

0 commit comments

Comments
 (0)