* [PATCH 3.9-stable] ASoC: wm8994: Fix reporting of accessory removal on
@ 2013-05-31 0:48 Jonghwan Choi
0 siblings, 0 replies; only message in thread
From: Jonghwan Choi @ 2013-05-31 0:48 UTC (permalink / raw)
To: 'Jonghwan Choi', linux-kernel; +Cc: stable, 'Mark Brown'
This patch looks like it should be in the 3.9-stable tree, should we apply
it?
------------------
From: "Mark Brown <broonie@opensource.wolfsonmicro.com>"
commit 9767a58b8b2a0b153c246fb6306c7d48d51bb379 upstream
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>
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
---
sound/soc/codecs/wm8994.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 8b769ba..f9dc7c0 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3791,6 +3791,11 @@ static irqreturn_t wm8958_mic_irq(int irq, void
*data)
dev_dbg(codec->dev, "Ignoring removed jack\n");
return IRQ_HANDLED;
}
+ } else if (!(reg & WM8958_MICD_STS)) {
+ snd_soc_jack_report(wm8994->micdet[0].jack, 0,
+ SND_JACK_MECHANICAL | SND_JACK_HEADSET |
+ wm8994->btn_mask);
+ goto out;
}
if (wm8994->mic_detecting)
--
1.7.9.5
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-05-31 0:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-31 0:48 [PATCH 3.9-stable] ASoC: wm8994: Fix reporting of accessory removal on Jonghwan Choi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®