From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 3 Jun 2011 16:09:14 +0000 (+0100)
Subject: ASoC: Enforce the mask in snd_soc_update_bits()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=78bf3c9ab69a957dfa58e521ce7fca056c86b980;p=linux-beck.git

ASoC: Enforce the mask in snd_soc_update_bits()

Avoids issues if someone does a read followed by restore and doesn't mask
out only the bits being updated.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 13a40fc78d32..c53f5d589591 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2323,7 +2323,7 @@ int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
 		return ret;
 
 	old = ret;
-	new = (old & ~mask) | value;
+	new = (old & ~mask) | (value & mask);
 	change = old != new;
 	if (change) {
 		ret = snd_soc_write(codec, reg, new);