]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: cadence-quadspi: fix clock imbalance on probe failure
authorJohan Hovold <johan@kernel.org>
Tue, 21 Apr 2026 12:53:50 +0000 (14:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 May 2026 15:16:29 +0000 (17:16 +0200)
commit cba53fe20c18688c17ca668ad0e4ec05e31c70d3 upstream.

Drop the bogus runtime PM get on probe failures that was never needed
and that leaks a usage count reference while preventing the clocks from
being disabled (as runtime PM has not yet been enabled).

Fixes: 1889dd208197 ("spi: cadence-quadspi: Fix clock disable on probe failure path")
Cc: stable@vger.kernel.org # 6.19
Cc: Anurag Dutta <a-dutta@ti.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260421125354.1534871-3-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/spi/spi-cadence-quadspi.c

index 5040e4e1cce03e9bd03cf045e5efb350661a0db5..b79f48f2420c3972c818fbdb98642700144b7370 100644 (file)
@@ -2004,8 +2004,7 @@ disable_rpm:
                pm_runtime_disable(dev);
        cqspi_controller_enable(cqspi, 0);
 disable_clks:
-       if (pm_runtime_get_sync(&pdev->dev) >= 0)
-               clk_bulk_disable_unprepare(CLK_QSPI_NUM, cqspi->clks);
+       clk_bulk_disable_unprepare(CLK_QSPI_NUM, cqspi->clks);
 
        return ret;
 }