ASoC: Merge v6.5-rc2

[linux-2.6-block.git] / drivers / bluetooth / hci_bcm.c

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 83bf5d4330c40de83a172e7ed0110f85e468c6a8..874d23089b39b5448a636de2b475da46ff1f74b9 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -643,7 +643,8 @@ static int bcm_setup(struct hci_uart *hu)
         * Allow the bootloader to set a valid address through the
         * device tree.
         */
-       set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hu->hdev->quirks);
+       if (test_bit(HCI_QUIRK_INVALID_BDADDR, &hu->hdev->quirks))
+               set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hu->hdev->quirks);
 
        if (!bcm_request_irq(bcm))
                err = bcm_setup_sleep(hu);