ASoC: cs35l56: sdw_write_no_pm() should be performed under a pm_runtime request
authorSimon Trimmer <simont@opensource.cirrus.com>
Thu, 18 May 2023 15:02:49 +0000 (16:02 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 19 May 2023 02:32:12 +0000 (11:32 +0900)
SoundWire bus accesses must be performed under the guard of a pm_runtime
request, in this case the write was being performed just after the
request had been put() and so the bus could not be guaranteed to be
available.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/Message-Id:
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs35l56.c

index e4bf388..d1d304a 100644 (file)
@@ -903,15 +903,15 @@ static void cs35l56_dsp_work(struct work_struct *work)
 err_unlock:
        mutex_unlock(&cs35l56->irq_lock);
 err:
-       pm_runtime_mark_last_busy(cs35l56->dev);
-       pm_runtime_put_autosuspend(cs35l56->dev);
-
        /* Re-enable SoundWire interrupts */
        if (cs35l56->sdw_peripheral) {
                cs35l56->sdw_irq_no_unmask = false;
                sdw_write_no_pm(cs35l56->sdw_peripheral, CS35L56_SDW_GEN_INT_MASK_1,
                                CS35L56_SDW_INT_MASK_CODEC_IRQ);
        }
+
+       pm_runtime_mark_last_busy(cs35l56->dev);
+       pm_runtime_put_autosuspend(cs35l56->dev);
 }
 
 static int cs35l56_component_probe(struct snd_soc_component *component)