]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: cs35l56: Fix flushing of IRQ work in cs35l56_sdw_remove()
authorRichard Fitzgerald <rf@opensource.cirrus.com>
Thu, 21 May 2026 12:30:57 +0000 (13:30 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 21 May 2026 13:13:06 +0000 (14:13 +0100)
Use flush_work() instead of cancel_work_sync() to terminate pending IRQ
work in cs35l56_sdw_remove(). And flush_work() again after masking the
interrupts to flush any queueing that was racing with the masking. This is
the same sequence as cs35l56_sdw_system_suspend().

cs35l56_sdw_interrupt() takes the pm_runtime to prevent the bus powering-
down before the interrupt status can be read and handled. The work releases
this pm_runtime. So cancelling it, instead of flushing, could leave an
unbalanced pm_runtime.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Fixes: e49611252900 ("ASoC: cs35l56: Add driver for Cirrus Logic CS35L56")
Link: https://patch.msgid.link/20260521123057.988732-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs35l56-sdw.c

index d344217de7aa62d224ef417cf7d01d5213edd0ab..88e0aac540d6872f0290614b64e8c1e92a899dd6 100644 (file)
@@ -585,10 +585,11 @@ static void cs35l56_sdw_remove(struct sdw_slave *peripheral)
 
        /* Disable SoundWire interrupts */
        cs35l56->sdw_irq_no_unmask = true;
-       cancel_work_sync(&cs35l56->sdw_irq_work);
+       flush_work(&cs35l56->sdw_irq_work);
        sdw_write_no_pm(peripheral, CS35L56_SDW_GEN_INT_MASK_1, 0);
        sdw_read_no_pm(peripheral, CS35L56_SDW_GEN_INT_STAT_1);
        sdw_write_no_pm(peripheral, CS35L56_SDW_GEN_INT_STAT_1, 0xFF);
+       flush_work(&cs35l56->sdw_irq_work);
 
        cs35l56_remove(cs35l56);
 }