Merge branch 'for-2.6.38' into for-2.6.39

e66ef2f8 · Mark Brown · 474b62d6 · 78b3fb46 · e66ef2f8 · e66ef2f8
Commit e66ef2f8 authored Jan 19, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/soc/codecs/wm8994.c sound/soc/codecs/wm8994.c +1 -1

sound/soc/codecs/wm8995.c sound/soc/codecs/wm8995.c +1 -1

No files found.
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2386,7 +2386,7 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
 	else
 		val = 0;
-	return snd_soc_update_bits(codec, reg, mask, reg);
+	return snd_soc_update_bits(codec, reg, mask, val);
 }
 #define WM8994_RATES SNDRV_PCM_RATE_8000_96000

--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -1265,7 +1265,7 @@ static int wm8995_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
 	else
 		val = 0;
-	return snd_soc_update_bits(codec, reg, mask, reg);
+	return snd_soc_update_bits(codec, reg, mask, val);
 }
 /* The size in bits of the FLL divide multiplied by 10