19 Oct
2010
19 Oct
'10
12:02 p.m.
On Tue, 2010-10-19 at 11:10 +0300, Jarkko Nikula wrote:
Use bitwise AND instead of logical AND when masking.
Signed-off-by: Jarkko Nikula jhnikula@gmail.com
Random note, not known to cause any problems at the moment as id field of codec seems to be unused.
sound/soc/soc-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8751efd..fe9f20b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2892,7 +2892,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);
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk