summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-10 10:28:51 +0100
committerMark Brown <broonie@linaro.org>2013-06-10 10:28:51 +0100
commit902a75cdc491066514aac35b40a756aaa9740173 (patch)
tree0d7d1b5a6fc578c67fdbc47fa230836f9d765668 /sound
parent4351ac5b9fb5df2f669c7bfba08c957fc201b150 (diff)
parent7afce3f5e56e9cb97cf1f35832bf8e8dde08cc45 (diff)
downloadlinux-902a75cdc491066514aac35b40a756aaa9740173.tar.bz2
Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index dfd997aaadfc..29e95f93d482 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3836,12 +3836,13 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
ret);
} else if (!(ret & WM1811_JACKDET_LVL)) {
dev_dbg(codec->dev, "Ignoring removed jack\n");
- return IRQ_HANDLED;
+ goto out;
}
} else if (!(reg & WM8958_MICD_STS)) {
snd_soc_jack_report(wm8994->micdet[0].jack, 0,
SND_JACK_MECHANICAL | SND_JACK_HEADSET |
wm8994->btn_mask);
+ wm8994->mic_detecting = true;
goto out;
}