[PATCH 2/2] spi: cadence-quadspi: Fix clock disable on probe failure path

Anurag Dutta posted 2 patches 1 day, 22 hours ago
[PATCH 2/2] spi: cadence-quadspi: Fix clock disable on probe failure path
Posted by Anurag Dutta 1 day, 22 hours ago
When cqspi_request_mmap_dma() returns -EPROBE_DEFER after runtime PM
is enabled, the error path calls clk_disable_unprepare() on an already
disabled clock, causing an imbalance.

Use pm_runtime_get_sync() to increment the usage counter and resume the
device. This prevents runtime_suspend() from being invoked and causing
a double clock disable.

Fixes: 140623410536 ("mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller")
Signed-off-by: Anurag Dutta <a-dutta@ti.com>
---
 drivers/spi/spi-cadence-quadspi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 7c1f742d95a6..f8823e83a622 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -2026,7 +2026,9 @@ static int cqspi_probe(struct platform_device *pdev)
 probe_reset_failed:
 	if (cqspi->is_jh7110)
 		cqspi_jh7110_disable_clk(pdev, cqspi);
-	clk_disable_unprepare(cqspi->clk);
+
+	if (pm_runtime_get_sync(&pdev->dev) >= 0)
+		clk_disable_unprepare(cqspi->clk);
 probe_clk_failed:
 	return ret;
 }
-- 
2.34.1
Re: [PATCH 2/2] spi: cadence-quadspi: Fix clock disable on probe failure path
Posted by Mark Brown 1 day, 21 hours ago
On Fri, Dec 12, 2025 at 12:53:12PM +0530, Anurag Dutta wrote:
> When cqspi_request_mmap_dma() returns -EPROBE_DEFER after runtime PM
> is enabled, the error path calls clk_disable_unprepare() on an already
> disabled clock, causing an imbalance.
> 
> Use pm_runtime_get_sync() to increment the usage counter and resume the
> device. This prevents runtime_suspend() from being invoked and causing
> a double clock disable.

Thanks - this is working for me with a hack to trigger the issue,
hopefully others seeing the issue in real scenarios can confirm.