From: "Diogo Ivo (Schneider Electric)" <diogo.ivo@bootlin.com>
To: Mark Brown <broonie@kernel.org>,
Matthew Gerlach <matthew.gerlach@altera.com>,
Khairul Anuar Romli <khairul.anuar.romli@altera.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dan Carpenter <dan.carpenter@linaro.org>
Cc: miquel.raynal@bootlin.com, thomas.petazzoni@bootlin.com,
Pascal EBERHARD <pascal.eberhard@se.com>,
linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
"Diogo Ivo (Schneider Electric)" <diogo.ivo@bootlin.com>,
stable@vger.kernel.org
Subject: [PATCH 2/2] spi: cadence-quadspi: release DMA channel on probe failure
Date: Fri, 31 Jul 2026 12:53:47 +0200 [thread overview]
Message-ID: <20260731-cqspi-pm_runtime-v1-2-ff0bfc9e8e56@bootlin.com> (raw)
In-Reply-To: <20260731-cqspi-pm_runtime-v1-0-ff0bfc9e8e56@bootlin.com>
When spi_register_controller() fails in cqspi_probe(), the DMA channel
acquired via cqspi_request_mmap_dma() is not released, leaking the channel.
Add a dedicated error label to release the DMA channel before the
existing runtime PM teardown path.
This fix is one part of upstream commit f18c8cfa4f1a ("spi: cadence-qspi:
Fix probe error path and remove").
Fixes: b85815675fc5 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths")
Cc: stable@vger.kernel.org
Signed-off-by: Diogo Ivo (Schneider Electric) <diogo.ivo@bootlin.com>
---
drivers/spi/spi-cadence-quadspi.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index d749dee54015..66304664a1cf 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -1982,14 +1982,17 @@ static int cqspi_probe(struct platform_device *pdev)
ret = spi_register_controller(host);
if (ret) {
dev_err(&pdev->dev, "failed to register SPI ctlr %d\n", ret);
- goto disable_rpm;
+ goto release_dma_chan;
}
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev);
return 0;
-disable_rpm:
+release_dma_chan:
+ if (cqspi->rx_chan)
+ dma_release_channel(cqspi->rx_chan);
+
pm_runtime_put_noidle(dev);
pm_runtime_dont_use_autosuspend(dev);
pm_runtime_disable(dev);
--
2.55.0
next prev parent reply other threads:[~2026-07-31 10:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-31 10:53 [PATCH 0/2] spi: cadence-quadspi: fix probe error path and remove Diogo Ivo (Schneider Electric)
2026-07-31 10:53 ` [PATCH 1/2] spi: cadence-quadspi: fix runtime pm cleanup on probe failure/unbind Diogo Ivo (Schneider Electric)
2026-07-31 10:53 ` Diogo Ivo (Schneider Electric) [this message]
2026-07-31 23:48 ` [PATCH 0/2] spi: cadence-quadspi: fix probe error path and remove Mark Brown
2026-08-01 11:27 ` Diogo Ivo
2026-08-01 15:54 ` Greg Kroah-Hartman
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=20260731-cqspi-pm_runtime-v1-2-ff0bfc9e8e56@bootlin.com \
--to=diogo.ivo@bootlin.com \
--cc=broonie@kernel.org \
--cc=dan.carpenter@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=khairul.anuar.romli@altera.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=matthew.gerlach@altera.com \
--cc=miquel.raynal@bootlin.com \
--cc=pascal.eberhard@se.com \
--cc=stable@vger.kernel.org \
--cc=thomas.petazzoni@bootlin.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