Merge remote-tracking branch 'asoc/fix/wm2000' into tmp

28f2675d · Mark Brown · 92a9d152 · 267f8fa2 · 28f2675d
Commit 28f2675d authored Jan 10, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/soc/codecs/wm2000.c sound/soc/codecs/wm2000.c +2 -2

No files found.
--- 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);