From: Cezary Rojewski <cezary.rojewski@intel.com>
To: broonie@kernel.org
Cc: tiwai@suse.com, perex@perex.cz, amade@asmblr.net,
linux-sound@vger.kernel.org, andriy.shevchenko@linux.intel.com,
Cezary Rojewski <cezary.rojewski@intel.com>
Subject: [PATCH 2/6] ASoC: Intel: catpt: Fix error path in hw_params()
Date: Fri, 21 Nov 2025 12:43:27 +0100 [thread overview]
Message-ID: <20251121114331.3841335-3-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20251121114331.3841335-1-cezary.rojewski@intel.com>
Do not leave any resources hanging on the DSP side if applying user
settings fails.
Fixes: 768a3a3b327d ("ASoC: Intel: catpt: Optimize applying user settings")
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
sound/soc/intel/catpt/pcm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c
index f15385683d9c..9baaad13a273 100644
--- a/sound/soc/intel/catpt/pcm.c
+++ b/sound/soc/intel/catpt/pcm.c
@@ -417,8 +417,10 @@ static int catpt_dai_hw_params(struct snd_pcm_substream *substream,
return CATPT_IPC_ERROR(ret);
ret = catpt_dai_apply_usettings(dai, stream);
- if (ret)
+ if (ret) {
+ catpt_ipc_free_stream(cdev, stream->info.stream_hw_id);
return ret;
+ }
stream->allocated = true;
return 0;
--
2.25.1
next prev parent reply other threads:[~2025-11-21 11:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-21 11:43 [PATCH 0/6] ASoC: Intel: catpt: Round of fixes and PM changes Cezary Rojewski
2025-11-21 11:43 ` [PATCH 1/6] ASoC: Intel: catpt: Fix offset checks Cezary Rojewski
2025-11-24 14:31 ` Andy Shevchenko
2025-11-24 18:20 ` Cezary Rojewski
2025-11-24 19:05 ` Andy Shevchenko
2025-11-24 19:06 ` Andy Shevchenko
2025-11-25 11:31 ` Cezary Rojewski
2025-11-25 18:24 ` Andy Shevchenko
2025-11-25 18:26 ` Andy Shevchenko
2025-11-21 11:43 ` Cezary Rojewski [this message]
2025-11-21 11:43 ` [PATCH 3/6] ASoC: Intel: catpt: Fix probing order of driver components Cezary Rojewski
2025-11-21 11:43 ` [PATCH 4/6] ASoC: Intel: catpt: Do not ignore errors on runtime resume Cezary Rojewski
2025-11-21 11:43 ` [PATCH 5/6] ASoC: Intel: catpt: Do not block the system from suspending Cezary Rojewski
2025-11-24 14:42 ` Andy Shevchenko
2025-11-24 18:05 ` Cezary Rojewski
2025-11-24 19:07 ` Andy Shevchenko
2025-11-21 11:43 ` [PATCH 6/6] ASoC: Intel: catpt: Drop catpt_runtime_resume() Cezary Rojewski
2025-11-24 14:37 ` Andy Shevchenko
2025-11-24 18:06 ` Cezary Rojewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251121114331.3841335-3-cezary.rojewski@intel.com \
--to=cezary.rojewski@intel.com \
--cc=amade@asmblr.net \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox