diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-03-13 17:35:08 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2013-03-13 17:35:08 -0700 |
| commit | 1249d25539343d1a7fe361c8d40be7a5df5b0216 (patch) | |
| tree | 770c9a33604bb00c62f44d780aefab27e4eb9379 /sound/soc | |
| parent | 4aad13d07babf68c1d0d37ff1e5f797573c4fd2a (diff) | |
| parent | 0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f (diff) | |
| download | kernel_samsung_tuna-1249d25539343d1a7fe361c8d40be7a5df5b0216.zip kernel_samsung_tuna-1249d25539343d1a7fe361c8d40be7a5df5b0216.tar.gz kernel_samsung_tuna-1249d25539343d1a7fe361c8d40be7a5df5b0216.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'sound/soc')
| -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 a3b9cbb..ba03dc2 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -224,9 +224,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); |