diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-10 17:41:54 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-10 17:41:54 +0100 |
commit | c18ab0bac4c377b22e03f9cd4efafa1316b76552 (patch) | |
tree | 57049641755e7e01d6da9a902ac662a28b688b0b /sound/soc/codecs/wm2000.c | |
parent | ALSA: hda - Add support of new codec ALC284 (diff) | |
parent | Merge remote-tracking branch 'asoc/fix/wm5100' into tmp (diff) | |
download | linux-dev-c18ab0bac4c377b22e03f9cd4efafa1316b76552.tar.xz linux-dev-c18ab0bac4c377b22e03f9cd4efafa1316b76552.zip |
Merge tag 'asoc-fix-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.8
Nothing terribly exciting here except for the DOUBLE_RANGE fix which
just hadn't worked before, nobody noticed due to lack of use.
Diffstat (limited to 'sound/soc/codecs/wm2000.c')
-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 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); |