diff options
| author | Stephen Warren <swarren@nvidia.com> | 2011-02-10 15:37:14 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-13 19:44:46 +0000 |
| commit | 3088e3b4963d26d6f6f54987f595b974ed6d48d8 (patch) | |
| tree | 958fe75fbbc05a994c3791c8cc97d606c96afe6a /sound | |
| parent | 28d639f7bd2559e3d6dc10c0316d19154b28a2a4 (diff) | |
| download | linux-stable-3088e3b4963d26d6f6f54987f595b974ed6d48d8.tar.gz linux-stable-3088e3b4963d26d6f6f54987f595b974ed6d48d8.tar.bz2 linux-stable-3088e3b4963d26d6f6f54987f595b974ed6d48d8.zip | |
ASoC: WM8903: Fix mic detection enable logic
The mic detection HW should be enabled when either mic or short detection
is required, not when only both are required.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Diffstat (limited to 'sound')
| -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, |