diff --git a/[refs] b/[refs]
index 0a04b33082a4..167bf21f713f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e86e1244a41352d1b78d32c10316fc4df2c86a8a
+refs/heads/master: 0589944661b9a9b9692f455fbbfce5eeda8fa7b6
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 63c80e634a37..862b1af5fbdf 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/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);