aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-28 07:52:08 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-28 10:22:36 -0400
commit9767a58b8b2a0b153c246fb6306c7d48d51bb379 (patch)
tree5131e2f2e7aa45cbfd11d199c28436f9fa7e8773
parentd3134e211e8db7fa833c40b5879fc022693e16c2 (diff)
ASoC: wm8994: Fix reporting of accessory removal on WM8958
During recent refactoring the code to report removal when MICDET reports an absent microphone was removed, causing problems for systems which rely solely on the MICDET for this functionality. Restore it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8994.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 62dc30598084..b38382cc4b59 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3833,6 +3833,11 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
3833 dev_dbg(codec->dev, "Ignoring removed jack\n"); 3833 dev_dbg(codec->dev, "Ignoring removed jack\n");
3834 return IRQ_HANDLED; 3834 return IRQ_HANDLED;
3835 } 3835 }
3836 } else if (!(reg & WM8958_MICD_STS)) {
3837 snd_soc_jack_report(wm8994->micdet[0].jack, 0,
3838 SND_JACK_MECHANICAL | SND_JACK_HEADSET |
3839 wm8994->btn_mask);
3840 goto out;
3836 } 3841 }
3837 3842
3838 if (wm8994->mic_detecting) 3843 if (wm8994->mic_detecting)