diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 07:22:26 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-10 07:22:26 -0500 |
| commit | 28f2675db8908eeb211391ea4415785a9203b25d (patch) | |
| tree | 6f2fa5ae5925b4b5fffe92d178a480989d5ede45 | |
| parent | 92a9d1524e8ac2a8f63cc829bf41813d44888bfe (diff) | |
| parent | 267f8fa2e1eef0612b2007e1f1846bcbc35cc1fa (diff) | |
Merge remote-tracking branch 'asoc/fix/wm2000' into tmp
| -rw-r--r-- | sound/soc/codecs/wm2000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 1cbe88f01d6..12bcae63a7f 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c | |||
| @@ -209,9 +209,9 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue) | |||
| 209 | 209 | ||
| 210 | ret = wm2000_read(i2c, WM2000_REG_SPEECH_CLARITY); | 210 | ret = wm2000_read(i2c, WM2000_REG_SPEECH_CLARITY); |
| 211 | if (wm2000->speech_clarity) | 211 | if (wm2000->speech_clarity) |
| 212 | ret &= ~WM2000_SPEECH_CLARITY; | ||
| 213 | else | ||
| 214 | ret |= WM2000_SPEECH_CLARITY; | 212 | ret |= WM2000_SPEECH_CLARITY; |
| 213 | else | ||
| 214 | ret &= ~WM2000_SPEECH_CLARITY; | ||
| 215 | wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, ret); | 215 | wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, ret); |
| 216 | 216 | ||
| 217 | wm2000_write(i2c, WM2000_REG_SYS_START0, 0x33); | 217 | wm2000_write(i2c, WM2000_REG_SYS_START0, 0x33); |