diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-04 12:40:22 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-04 12:40:25 +0300 |
| commit | 888a8a3e9d79cbb9d83e53955f684998248580ec (patch) | |
| tree | 3dbf548438c77d89c8696a9a79c4129cdc2f3d3e /sound/soc/codecs/wm8903.c | |
| parent | cfff2d909cbdaf8c467bd321aa0502a548ec8f7e (diff) | |
| parent | b06b3d49699a52e8f9ca056c4f96e81b1987d78e (diff) | |
| download | linux-888a8a3e9d79cbb9d83e53955f684998248580ec.tar.xz | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up updates before queueing up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
| -rw-r--r-- | sound/soc/codecs/wm8903.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 987476a5895f..017d99ceb42e 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1482,7 +1482,7 @@ int wm8903_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, WM8903_MICDET_EINT | WM8903_MICSHRT_EINT, irq_mask); - if (det && shrt) { + if (det || shrt) { /* Enable mic detection, this may not have been set through * platform data (eg, if the defaults are OK). */ snd_soc_update_bits(codec, WM8903_WRITE_SEQUENCER_0, |