diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 14:50:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 14:50:22 +0000 |
| commit | e66ef2f81f1d36b5413e3fc7ff548de683f0750b (patch) | |
| tree | e2adec7e3cfc1f759c0368570307fce507e09d2e /sound | |
| parent | 474b62d6eee733abdcd36f8e3e5ce504fbb9110b (diff) | |
| parent | 78b3fb46753872fc79bffecc8d50355a8622b39b (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8995.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 0bb0bb40b842..0ca81d3c64e8 100644 --- 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 diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 7d563413df3e..67eaaecbb42e 100644 --- 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 |