ASoC: Fix I2C component device id number creation

Use bitwise AND instead of logical AND when masking. Signed-off-by: Jarkko Nikula <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
amrav · Oct 19, 2010 · 0589944 · 0589944
1 parent e86e124
commit 0589944
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);