---

yaml --- r: 257490 b: refs/heads/master c: 78bf3c9 h: refs/heads/master v: v3
git-mirror · Jun 6, 2011 · 9003c4c · 9003c4c
1 parent e5c2bc6
commit 9003c4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51b3b5cabb1d7d6ca12416652e2df2e01eb61fb9
+refs/heads/master: 78bf3c9ab69a957dfa58e521ce7fca056c86b980
diff --git a/trunk/sound/soc/soc-core.c b/trunk/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);