[PATCH v2 19/25] ASoC: intel: atom: Fix .shutdown() being skipped on rollback
flat view
COLD16d
From: <hidden>
Date: 2026-10-15 01:49:24
Also in:
asahi, imx, linux-renesas-soc, linux-rockchip, linux-sound, lkml
Subsystem:
intel asoc drivers, sound, sound - soc layer / dynamic audio power management (asoc), the rest · Maintainers:
Cezary Rojewski, Liam Girdwood, Peter Ujfalusi, Bard Liao, Kai Vehmanen, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Linus Torvalds
Revision v2 (2 revisions archived).
Revisions (2)
- v1
- v2 current [diff against previous]
From: bui duc phuc <redacted>
snd_pcm_hw_constraint_integer() may return 1, which is then returned
from sst_media_open(). ASoC only marks the DAI as started when
.startup() returns 0, so .shutdown() can be skipped on rollback.
Return 0 explicitly on success.
Fixes: 4889a8a73f65 ("ASoC: intel: atom: Use __free(kfree) for stream pointer")
Fixes: 6cc0f4e63994 ("ASoC: Intel: mfld_pcm: move stream handling to dai_ops")
Signed-off-by: bui duc phuc <redacted>
---
sound/soc/intel/atom/sst-mfld-platform-pcm.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index a4c8cbfba096..58681e007abf 100644
--- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c@@ -341,7 +341,12 @@ static int sst_media_open(struct snd_pcm_substream *substream, stream = NULL; - return ret_val; + /* + * ASoC only marks the DAI as started when .startup() returns 0. + * Since snd_pcm_hw_constraint_integer() may return 1, explicitly + * return 0 to ensure .shutdown() is not skipped on rollback. + */ + return 0; } static void sst_media_close(struct snd_pcm_substream *substream,
--
2.43.0