All of lore.kernel.org
 help / color / mirror / Atom feed
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 05/11] ASoC: Intel: avs: Clean up the bus when fetching ML caps fails
Date: Mon, 31 Aug 2026 11:36:09 +0200	[thread overview]
Message-ID: <20260831093615.1117987-6-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20260831093615.1117987-1-cezary.rojewski@intel.com>

snd_hdac_ext_bus_get_ml_capabilities() may fail and its return code
shall be checked and accounted for. Address the issue by updating the
error-path for avs_pci_probe().

At the same time, if the function in question succeeds but the next part
of avs_pci_probe() fails, the hlink list shall be cleaned up before
leaving the scope.

Fixes: 1affc44ea5dd ("ASoC: Intel: avs: PCI driver implementation")
Co-developed-by: Amadeusz Sławiński <amade@asmblr.net>
Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/intel/avs/core.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index f45256ff5bac..8f27a7d43718 100644
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -475,8 +475,13 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 	}
 
 	snd_hdac_bus_parse_capabilities(bus);
-	if (bus->mlcap)
-		snd_hdac_ext_bus_get_ml_capabilities(bus);
+	if (bus->mlcap) {
+		ret = snd_hdac_ext_bus_get_ml_capabilities(bus);
+		if (ret < 0) {
+			dev_err(dev, "failed to get ml capabilities: %d\n", ret);
+			goto err_ml_cap;
+		}
+	}
 
 	if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)))
 		dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
@@ -518,6 +523,8 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 	snd_hdac_bus_free_stream_pages(bus);
 	snd_hdac_ext_stream_free_all(bus);
 err_init_streams:
+	snd_hdac_ext_link_free_all(bus);
+err_ml_cap:
 	iounmap(adev->dsp_ba);
 err_remap_bar4:
 	iounmap(bus->remap_addr);
-- 
2.34.1


  parent reply	other threads:[~2026-08-31  9:32 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 ` [PATCH v2 02/11] ALSA: hda: ext: Clean up links if their initialization fails Cezary Rojewski
2026-08-31  9:36 ` [PATCH v2 03/11] ALSA: hda: ext: Clean up streams " 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 ` Cezary Rojewski [this message]
2026-08-31  9:36 ` [PATCH v2 06/11] ASoC: Intel: avs: Clean up streams if their " 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-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.