kernel: bump 6.1 to 6.1.39

[openwrt/staging/hauke.git] / target / linux / bcm27xx / patches-6.1 / 950-0699-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch

diff --git a/target/linux/bcm27xx/patches-6.1/950-0699-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch b/target/linux/bcm27xx/patches-6.1/950-0699-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch
index 6fd82ce0112e4595197cbbd7df1762a87251c227..fd84781729762b44b5ad3a73be57f7d136e62e07 100644 (file)
--- a/target/linux/bcm27xx/patches-6.1/950-0699-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0699-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch
@@ -31,11 +31,11 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 @@ -4568,7 +4569,9 @@ static int hci_dev_setup_sync(struct hci
  
        if (!ret) {
-               if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) {
--                      if (!bacmp(&hdev->public_addr, BDADDR_ANY))
-+                      if (!bacmp(&hdev->public_addr, BDADDR_ANY) &&
-+                          (invalid_bdaddr ||
-+                           !fwnode_property_present(fwnode, "fallback-bd-address")))
-                               hci_dev_get_bd_addr_from_property(hdev);
+               if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
+-                  !bacmp(&hdev->public_addr, BDADDR_ANY))
++                  !bacmp(&hdev->public_addr, BDADDR_ANY) &&
++                  (invalid_bdaddr ||
++                   !fwnode_property_present(fwnode, "fallback-bd-address")))
+                       hci_dev_get_bd_addr_from_property(hdev);
  
-                       if (bacmp(&hdev->public_addr, BDADDR_ANY) &&
+               if ((invalid_bdaddr ||