[PATCH next] ASoC: amd: acp: Fix leak in acp_pci_probe()

Dan Carpenter posted 1 patch 9 months, 1 week ago
sound/soc/amd/acp/acp-pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH next] ASoC: amd: acp: Fix leak in acp_pci_probe()
Posted by Dan Carpenter 9 months, 1 week ago
There needs to be some cleanup on this error path.  We can't just
return directly.

Fixes: aaf7a668bb38 ("ASoC: amd: acp: Add new interrupt handle callbacks in acp_common_hw_ops")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
 sound/soc/amd/acp/acp-pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c
index 9322379cb36f..123524f90d6c 100644
--- a/sound/soc/amd/acp/acp-pci.c
+++ b/sound/soc/amd/acp/acp-pci.c
@@ -183,7 +183,7 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id
 			       IRQF_SHARED, "ACP_I2S_IRQ", chip);
 	if (ret) {
 		dev_err(&pci->dev, "ACP I2S IRQ request failed %d\n", ret);
-		return ret;
+		goto de_init;
 	}
 
 	check_acp_config(pci, chip);
-- 
2.47.2
Re: [PATCH next] ASoC: amd: acp: Fix leak in acp_pci_probe()
Posted by Mark Brown 9 months ago
On Fri, 14 Mar 2025 13:11:43 +0300, Dan Carpenter wrote:
> There needs to be some cleanup on this error path.  We can't just
> return directly.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: amd: acp: Fix leak in acp_pci_probe()
      commit: 02026aabaa8225bd7dfdcb8ae106453e002cb0a8

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark