summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-10 12:22:26 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-10 12:22:26 +0000
commit28f2675db8908eeb211391ea4415785a9203b25d (patch)
tree6f2fa5ae5925b4b5fffe92d178a480989d5ede45 /sound
parent92a9d1524e8ac2a8f63cc829bf41813d44888bfe (diff)
parent267f8fa2e1eef0612b2007e1f1846bcbc35cc1fa (diff)
downloadlinux-28f2675db8908eeb211391ea4415785a9203b25d.tar.bz2
Merge remote-tracking branch 'asoc/fix/wm2000' into tmp
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm2000.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index 1cbe88f01d63..12bcae63a7f0 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)
ret = wm2000_read(i2c, WM2000_REG_SPEECH_CLARITY);
if (wm2000->speech_clarity)
- ret &= ~WM2000_SPEECH_CLARITY;
- else
ret |= WM2000_SPEECH_CLARITY;
+ else
+ ret &= ~WM2000_SPEECH_CLARITY;
wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, ret);
wm2000_write(i2c, WM2000_REG_SYS_START0, 0x33);