Commit 3088e3b4 authored Feb 10, 2011 by Stephen Warren Committed by Mark Brown Feb 13, 2011

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

parent 28d639f7

sound/soc/codecs/wm8903.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,