[PATCH] ALSA: hda: cs35l56: Stop cs_dsp before calling cs_dsp_power_down()

[PATCH] ALSA: hda: cs35l56: Stop cs_dsp before calling cs_dsp_power_down()

[Richard Fitzgerald]

In cs35l56_hda_unbind() call cs_dsp_stop() before cs_dsp_power_down()
if cs_dsp is in a running state.

cs35l56_hda_runtime_resume() calls cs_dsp_run() if cs_dsp_power_up() has
previously run successfully. If cs35l56_hda_unbind() is then called while
in this runtime-resumed state cs_dsp will be running. The code wasn't
checking for this and was calling cs_dsp_power_down() while still in a
running state, which is illegal. This is currently fairly harmless for
the cs35l56 driver. But it doesn't comply with the API, so potentially
could break with any future changes that expect the correct API use.

Fixes: fb78d73dde2d4 ("ALSA: hda/cs35l56: Call cs_dsp_power_down() before calling cs_dsp_remove()")
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
 sound/hda/codecs/side-codecs/cs35l56_hda.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/hda/codecs/side-codecs/cs35l56_hda.c b/sound/hda/codecs/side-codecs/cs35l56_hda.c
index 148d760987fdd..5982eebae1525 100644
--- a/sound/hda/codecs/side-codecs/cs35l56_hda.c
+++ b/sound/hda/codecs/side-codecs/cs35l56_hda.c
@@ -809,6 +809,8 @@ static void cs35l56_hda_unbind(struct device *dev, struct device *master, void *
 	cs_dsp_cleanup_debugfs(&cs35l56->cs_dsp);
 	debugfs_remove_recursive(cs35l56->debugfs_root);
 #endif
+	if (cs35l56->cs_dsp.running)
+		cs_dsp_stop(&cs35l56->cs_dsp);
 
 	if (cs35l56->cs_dsp.booted)
 		cs_dsp_power_down(&cs35l56->cs_dsp);
-- 
2.47.3

Re: [PATCH] ALSA: hda: cs35l56: Stop cs_dsp before calling cs_dsp_power_down()

[Takashi Iwai]

On Wed, 04 Nov 2026 13:23:37 +0100,
Richard Fitzgerald wrote:
> 
> In cs35l56_hda_unbind() call cs_dsp_stop() before cs_dsp_power_down()
> if cs_dsp is in a running state.
> 
> cs35l56_hda_runtime_resume() calls cs_dsp_run() if cs_dsp_power_up() has
> previously run successfully. If cs35l56_hda_unbind() is then called while
> in this runtime-resumed state cs_dsp will be running. The code wasn't
> checking for this and was calling cs_dsp_power_down() while still in a
> running state, which is illegal. This is currently fairly harmless for
> the cs35l56 driver. But it doesn't comply with the API, so potentially
> could break with any future changes that expect the correct API use.
> 
> Fixes: fb78d73dde2d4 ("ALSA: hda/cs35l56: Call cs_dsp_power_down() before calling cs_dsp_remove()")
> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>

Applied now.  Thanks.


Takashi