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,
Cezary Rojewski <cezary.rojewski@intel.com>
Subject: [PATCH v2 02/11] ALSA: hda: ext: Clean up links if their initialization fails
Date: Mon, 31 Aug 2026 11:36:06 +0200 [thread overview]
Message-ID: <20260831093615.1117987-3-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20260831093615.1117987-1-cezary.rojewski@intel.com>
snd_hdac_ext_bus_get_ml_capabilities() allocates the hlink nodes
one-by-one but the procedure may fails due to -ENOMEM in the middle of
it. Clean up the list before returning the error code to simply the
function usage.
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
sound/hda/core/ext/controller.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/sound/hda/core/ext/controller.c b/sound/hda/core/ext/controller.c
index b1f1eff1d181..f75d3dcc6cb2 100644
--- a/sound/hda/core/ext/controller.c
+++ b/sound/hda/core/ext/controller.c
@@ -81,7 +81,7 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus)
{
int idx;
u32 link_count;
- struct hdac_ext_link *hlink;
+ struct hdac_ext_link *hlink, *save;
u32 leptr;
link_count = readl(bus->mlcap + AZX_REG_ML_MLCD) + 1;
@@ -91,7 +91,7 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus)
for (idx = 0; idx < link_count; idx++) {
hlink = kzalloc_obj(*hlink);
if (!hlink)
- return -ENOMEM;
+ goto err_nomem;
hlink->index = idx;
hlink->bus = bus;
hlink->ml_addr = bus->mlcap + AZX_ML_BASE +
@@ -112,6 +112,13 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_bus *bus)
}
return 0;
+
+err_nomem:
+ list_for_each_entry_safe(hlink, save, &bus->hlink_list, list) {
+ list_del(&hlink->list);
+ kfree(hlink);
+ }
+ return -ENOMEM;
}
EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_get_ml_capabilities);
--
2.34.1
next prev parent reply other threads:[~2026-08-31 9:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-31 9:36 [PATCH v2 00/11] ALSA/ASoC: Intel: avs: HDAudio bus and general fixes Cezary Rojewski
2026-08-31 9:36 ` [PATCH v2 01/11] ALSA: hda: Clean up pages when stream buffers allocation fails Cezary Rojewski
2026-08-31 9:36 ` Cezary Rojewski [this message]
2026-08-31 9:36 ` [PATCH v2 03/11] ALSA: hda: ext: Clean up streams if their initialization fails Cezary Rojewski
2026-08-31 9:36 ` [PATCH v2 04/11] ASoC: Intel: avs: Clean up the bus when its " Cezary Rojewski
2026-08-31 9:36 ` [PATCH v2 05/11] ASoC: Intel: avs: Clean up the bus when fetching ML caps fails Cezary Rojewski
2026-08-31 9:36 ` [PATCH v2 06/11] ASoC: Intel: avs: Clean up streams if their initialization fails Cezary Rojewski
2026-08-31 9:36 ` [PATCH v2 07/11] ASoC: Intel: avs: Do not ignore -ENOENT when loading a topology Cezary Rojewski
2026-08-31 9:36 ` [PATCH v2 08/11] ASoC: Intel: avs: Cancel d0ix_work asynchrounously during recovery Cezary Rojewski
2026-08-31 9:36 ` [PATCH v2 09/11] ASoC: Intel: avs: Fix unbalanced module reference count Cezary Rojewski
2026-08-31 9:36 ` [PATCH v2 10/11] ASoC: Intel: avs: Refactor and fix init_config access Cezary Rojewski
2026-08-31 9:36 ` [PATCH v2 11/11] ASoC: Intel: avs: hda: Constrain MSBs on startup Cezary Rojewski
2026-08-31 12:14 ` [PATCH v2 00/11] ALSA/ASoC: Intel: avs: HDAudio bus and general fixes Mark Brown
2026-08-31 13:29 ` 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=20260831093615.1117987-3-cezary.rojewski@intel.com \
--to=cezary.rojewski@intel.com \
--cc=amade@asmblr.net \
--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