aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 63c80e634a37..862b1af5fbdf 100644
--- 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)
2929 char tmp[NAME_SIZE]; 2929 char tmp[NAME_SIZE];
2930 2930
2931 /* create unique ID number from I2C addr and bus */ 2931 /* create unique ID number from I2C addr and bus */
2932 *id = ((id1 && 0xffff) << 16) + id2; 2932 *id = ((id1 & 0xffff) << 16) + id2;
2933 2933
2934 /* sanitize component name for DAI link creation */ 2934 /* sanitize component name for DAI link creation */
2935 snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name, name); 2935 snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name, name);