From: Dan Carpenter <dan.carpenter@linaro.org>
To: Biju Das <biju.das.jz@bp.renesas.com>
Cc: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] ASoC: renesas: rz-ssi: Clean up on error in probe()
Date: Wed, 15 Jan 2025 09:55:12 +0300 [thread overview]
Message-ID: <14864a18-c256-4c7d-b064-ba1400bed894@stanley.mountain> (raw)
Call rz_ssi_release_dma_channels() on these error paths to clean up from
rz_ssi_dma_request().
Fixes: 26ac471c5354 ("ASoC: sh: rz-ssi: Add SSI DMAC support")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
sound/soc/renesas/rz-ssi.c | 42 ++++++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 15 deletions(-)
diff --git a/sound/soc/renesas/rz-ssi.c b/sound/soc/renesas/rz-ssi.c
index 3a0af4ca7ab6..4b3016282717 100644
--- a/sound/soc/renesas/rz-ssi.c
+++ b/sound/soc/renesas/rz-ssi.c
@@ -1150,35 +1150,47 @@ static int rz_ssi_probe(struct platform_device *pdev)
ssi->irq_rx = platform_get_irq_byname(pdev, "dma_rx");
if (ssi->irq_tx == -ENXIO && ssi->irq_rx == -ENXIO) {
ssi->irq_rt = platform_get_irq_byname(pdev, "dma_rt");
- if (ssi->irq_rt < 0)
- return ssi->irq_rt;
+ if (ssi->irq_rt < 0) {
+ ret = ssi->irq_rt;
+ goto err_release_dma_chs;
+ }
ret = devm_request_irq(dev, ssi->irq_rt,
&rz_ssi_interrupt, 0,
dev_name(dev), ssi);
- if (ret < 0)
- return dev_err_probe(dev, ret,
- "irq request error (dma_rt)\n");
+ if (ret < 0) {
+ dev_err_probe(dev, ret,
+ "irq request error (dma_rt)\n");
+ goto err_release_dma_chs;
+ }
} else {
- if (ssi->irq_tx < 0)
- return ssi->irq_tx;
+ if (ssi->irq_tx < 0) {
+ ret = ssi->irq_tx;
+ goto err_release_dma_chs;
+ }
- if (ssi->irq_rx < 0)
- return ssi->irq_rx;
+ if (ssi->irq_rx < 0) {
+ ret = ssi->irq_rx;
+ goto err_release_dma_chs;
+ }
ret = devm_request_irq(dev, ssi->irq_tx,
&rz_ssi_interrupt, 0,
dev_name(dev), ssi);
- if (ret < 0)
- return dev_err_probe(dev, ret,
- "irq request error (dma_tx)\n");
+ if (ret < 0) {
+ dev_err_probe(dev, ret,
+ "irq request error (dma_tx)\n");
+ goto err_release_dma_chs;
+ }
ret = devm_request_irq(dev, ssi->irq_rx,
&rz_ssi_interrupt, 0,
dev_name(dev), ssi);
- if (ret < 0)
- return dev_err_probe(dev, ret,
- "irq request error (dma_rx)\n");
+ if (ret < 0) {
+ dev_err_probe(dev, ret,
+ "irq request error (dma_rx)\n");
+ goto err_release_dma_chs;
+ }
}
}
--
2.45.2
next reply other threads:[~2025-01-15 6:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-15 6:55 Dan Carpenter [this message]
2025-01-17 11:51 ` Claudiu Beznea
2025-01-20 10:32 ` Dan Carpenter
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=14864a18-c256-4c7d-b064-ba1400bed894@stanley.mountain \
--to=dan.carpenter@linaro.org \
--cc=biju.das.jz@bp.renesas.com \
--cc=broonie@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--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
all inboxes | Powered by JetHome®