diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 09:50:22 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 09:50:22 -0500 |
| commit | e66ef2f81f1d36b5413e3fc7ff548de683f0750b (patch) | |
| tree | e2adec7e3cfc1f759c0368570307fce507e09d2e /sound/soc/codecs/wm8995.c | |
| parent | 474b62d6eee733abdcd36f8e3e5ce504fbb9110b (diff) | |
| parent | 78b3fb46753872fc79bffecc8d50355a8622b39b (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/codecs/wm8995.c')
| -rw-r--r-- | sound/soc/codecs/wm8995.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
| 1265 | else | 1265 | else |
| 1266 | val = 0; | 1266 | val = 0; |
| 1267 | 1267 | ||
| 1268 | return snd_soc_update_bits(codec, reg, mask, reg); | 1268 | return snd_soc_update_bits(codec, reg, mask, val); |
| 1269 | } | 1269 | } |
| 1270 | 1270 | ||
| 1271 | /* The size in bits of the FLL divide multiplied by 10 | 1271 | /* The size in bits of the FLL divide multiplied by 10 |