ASoC: Fix I2C component device id number creation

[deliverable/linux.git] / sound / soc / soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 63c80e634a37cd858966ae85d27308813fb3f9af..862b1af5fbdf8dde9f70510265872a4298b96eca 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2929,7 +2929,7 @@ static inline char *fmt_single_name(struct device *dev, int *id)
                        char tmp[NAME_SIZE];
 
                        /* create unique ID number from I2C addr and bus */
-                       *id = ((id1 && 0xffff) << 16) + id2;
+                       *id = ((id1 & 0xffff) << 16) + id2;
 
                        /* sanitize component name for DAI link creation */
                        snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name, name);