Merge tag 'efi-urgent-2021-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / soundwire / slave.c

diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c
index 180f38b..0eed38a 100644 (file)
--- a/drivers/soundwire/slave.c
+++ b/drivers/soundwire/slave.c
@@ -88,6 +88,7 @@ int sdw_slave_add(struct sdw_bus *bus,
 
        return ret;
 }
+EXPORT_SYMBOL(sdw_slave_add);
 
 #if IS_ENABLED(CONFIG_ACPI)
 
@@ -95,7 +96,7 @@ static bool find_slave(struct sdw_bus *bus,
                       struct acpi_device *adev,
                       struct sdw_slave_id *id)
 {
-       unsigned long long addr;
+       u64 addr;
        unsigned int link_id;
        acpi_status status;
 
@@ -108,6 +109,12 @@ static bool find_slave(struct sdw_bus *bus,
                return false;
        }
 
+       if (bus->ops->override_adr)
+               addr = bus->ops->override_adr(bus, addr);
+
+       if (!addr)
+               return false;
+
        /* Extract link id from ADR, Bit 51 to 48 (included) */
        link_id = SDW_DISCO_LINK_ID(addr);