Merge tag 'upstream-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs

[linux.git] / drivers / soundwire / bus.c

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index fc53dbe57f8545bcad26f84a63bfe57c14e564ed..be5d437058ed198e5d779336a8b73fac737aec28 100644 (file)
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -422,10 +422,11 @@ static struct sdw_slave *sdw_get_slave(struct sdw_bus *bus, int i)
 
 static int sdw_compare_devid(struct sdw_slave *slave, struct sdw_slave_id id)
 {
-       if (slave->id.unique_id != id.unique_id ||
-           slave->id.mfg_id != id.mfg_id ||
+       if (slave->id.mfg_id != id.mfg_id ||
            slave->id.part_id != id.part_id ||
-           slave->id.class_id != id.class_id)
+           slave->id.class_id != id.class_id ||
+           (slave->id.unique_id != SDW_IGNORED_UNIQUE_ID &&
+            slave->id.unique_id != id.unique_id))
                return -ENODEV;
 
        return 0;