Revert "Bluetooth: fix use-bdaddr-property quirk"

This reverts commit 6945795.
sm7150-mainline · Nov 10, 2023 · d5bd36c · d5bd36c
1 parent 6ec6517
commit d5bd36c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
@@ -4700,14 +4700,16 @@ static int hci_dev_setup_sync(struct hci_dev *hdev)
 	 * BD_ADDR invalid before creating the HCI device or in
 	 * its setup callback.
 	 */
-	invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks) ||
-			 test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
+	invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
+
 	if (!ret) {
 		if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
 		    !bacmp(&hdev->public_addr, BDADDR_ANY))
 			hci_dev_get_bd_addr_from_property(hdev);
 
-		if (invalid_bdaddr && bacmp(&hdev->public_addr, BDADDR_ANY) &&
+		if ((invalid_bdaddr ||
+		     test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) &&
+		    bacmp(&hdev->public_addr, BDADDR_ANY) &&
 		    hdev->set_bdaddr) {
 			ret = hdev->set_bdaddr(hdev, &hdev->public_addr);
 			if (!ret)