]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: nau8821: Cancel pending work before suspend
authorCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Wed, 31 Dec 2025 20:04:17 +0000 (22:04 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 5 Jan 2026 13:25:47 +0000 (13:25 +0000)
A jack detection work that is unscheduled or in progress while executing
the suspend handler could trigger a race condition.

Ensure state consistency by cancelling any pending work or wait for its
execution to complete before processing the suspend.  Since driver
(re)enables both insert and eject interrupts on resume, there is no risk
to miss the related jack events.  Therefore, flush_delayed_work() is not
required here.

Fixes: aab1ad11d69f ("ASoC: nau8821: new driver")
Fixes: ee70bacef1c6 ("ASoC: nau8821: Avoid unnecessary blocking in IRQ handler")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://patch.msgid.link/20251231-nau8821-cleanup-v1-3-6b0b76cbbb64@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/nau8821.c

index 2e2714b475012dd3f5c430e7013c9a70e16fefe1..58d2d5e77c8f4419a6caa75576a1a425565fd958 100644 (file)
@@ -1605,6 +1605,10 @@ static int __maybe_unused nau8821_suspend(struct snd_soc_component *component)
 
        if (nau8821->irq)
                disable_irq(nau8821->irq);
+
+       if (nau8821->jdet_active)
+               cancel_delayed_work_sync(&nau8821->jdet_work);
+
        snd_soc_dapm_force_bias_level(nau8821->dapm, SND_SOC_BIAS_OFF);
        /* Power down codec power; don't support button wakeup */
        snd_soc_dapm_disable_pin(nau8821->dapm, "MICBIAS");