Unverified Commit 6e54919c authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Mark Brown
Browse files

ASoC: nau8821: Cancel jdet_work before handling jack ejection 



The microphone detection work scheduled by a prior jack insertion
interrupt may still be in a pending state or under execution when a jack
ejection interrupt has been fired.

This might lead to a racing condition or nau8821_jdet_work() completing
after nau8821_eject_jack(), which will override the currently
disconnected state of the jack and incorrectly report the headphone or
the headset as being connected.

Cancel any pending jdet_work or wait for its execution to finish before
attempting to handle the ejection interrupt.

Proceed similarly before launching the eject handler as a consequence of
detecting an invalid insert interrupt.

Fixes: aab1ad11 ("ASoC: nau8821: new driver")
Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://patch.msgid.link/20251003-nau8821-jdet-fixes-v1-1-f7b0e2543f09@collabora.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3a866087

sound/soc/codecs/nau8821.c

+2 −1
Original line number Diff line number Diff line
@@ -1185,6 +1185,7 @@ static irqreturn_t nau8821_interrupt(int irq, void *data) 


	if ((active_irq & NAU8821_JACK_EJECT_IRQ_MASK) ==

		NAU8821_JACK_EJECT_DETECTED) {

		cancel_work_sync(&nau8821->jdet_work);

		regmap_update_bits(regmap, NAU8821_R71_ANALOG_ADC_1,

			NAU8821_MICDET_MASK, NAU8821_MICDET_DIS);

		nau8821_eject_jack(nau8821);
@@ -1199,11 +1200,11 @@ static irqreturn_t nau8821_interrupt(int irq, void *data) 
		clear_irq = NAU8821_KEY_RELEASE_IRQ;

	} else if ((active_irq & NAU8821_JACK_INSERT_IRQ_MASK) ==

		NAU8821_JACK_INSERT_DETECTED) {

		cancel_work_sync(&nau8821->jdet_work);

		regmap_update_bits(regmap, NAU8821_R71_ANALOG_ADC_1,

			NAU8821_MICDET_MASK, NAU8821_MICDET_EN);

		if (nau8821_is_jack_inserted(regmap)) {

			/* detect microphone and jack type */

			cancel_work_sync(&nau8821->jdet_work);

			schedule_work(&nau8821->jdet_work);

			/* Turn off insertion interruption at manual mode */

			regmap_update_bits(regmap,