commit 902a75cdc491066514aac35b40a756aaa9740173
author Mark Brown <broonie@linaro.org> Mon Jun 10 10:28:51 2013 +0100
committer Mark Brown <broonie@linaro.org> Mon Jun 10 10:28:51 2013 +0100
tree 0d7d1b5a6fc578c67fdbc47fa230836f9d765668
parent 4351ac5b9fb5df2f669c7bfba08c957fc201b150
parent 7afce3f5e56e9cb97cf1f35832bf8e8dde08cc45

Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus

sound/soc/codecs/wm8994.c

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index dfd997a..29e95f9 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3836,12 +3836,13 @@
 				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;
 	}