Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e874de43 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm8994: Check jack is inserted when handling mic IRQ 



If we've got jack detection support then check that the jack is still
inserted when handling a mic IRQ in order to avoid transient reports
caused by shorts during the removal process as the two interrupts race
with each other.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 63dd5452

sound/soc/codecs/wm8994.c

+12 −0
Original line number Diff line number Diff line
@@ -3755,6 +3755,18 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) 
	trace_snd_soc_jack_irq(dev_name(codec->dev));

#endif



	/* Avoid a transient report when the accessory is being removed */

	if (wm8994->jackdet) {

		reg = snd_soc_read(codec, WM1811_JACKDET_CTRL);

		if (reg < 0) {

			dev_err(codec->dev, "Failed to read jack status: %d\n",

				reg);

		} else if (!(reg & WM1811_JACKDET_LVL)) {

			dev_dbg(codec->dev, "Ignoring removed jack\n");

			return IRQ_HANDLED;

		}

	}



	if (wm8994->mic_detecting)

		wm8958_mic_id(codec, reg);

	else