aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-10-19 11:10:45 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-10-19 03:07:09 -0700
commit0589944661b9a9b9692f455fbbfce5eeda8fa7b6 (patch)
treef87df0492fc18716a184fb39eb96e8c036a856ad /sound
parente86e1244a41352d1b78d32c10316fc4df2c86a8a (diff)
downloadlinux-2.6.38-lt-ux500-0589944661b9a9b9692f455fbbfce5eeda8fa7b6.tar.gz
ASoC: Fix I2C component device id number creation
Use bitwise AND instead of logical AND when masking. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-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 63c80e634a3..862b1af5fbd 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)
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);