]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: imx: fix runtime pm leak on probe deferral
authorJohan Hovold <johan@kernel.org>
Tue, 21 Apr 2026 12:56:32 +0000 (14:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 May 2026 15:16:28 +0000 (17:16 +0200)
commit a1d50a37d3b1df84f536a982f692371039df4a48 upstream.

Make sure to balance the runtime PM usage count before returning on
probe failure (e.g. probe deferral) so that the controller can be
suspended when a driver is later bound.

Fixes: 43b6bf406cd0 ("spi: imx: fix runtime pm support for !CONFIG_PM")
Cc: stable@vger.kernel.org # 5.10
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260421125632.1537235-1-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/spi/spi-imx.c

index a8d90c86a8a11daaa0dab0656eed02acdc21ed35..164167b593ef42a13b66bb9f76af98709ad9b337 100644 (file)
@@ -2384,6 +2384,7 @@ out_register_controller:
 out_runtime_pm_put:
        pm_runtime_dont_use_autosuspend(spi_imx->dev);
        pm_runtime_disable(spi_imx->dev);
+       pm_runtime_put_noidle(spi_imx->dev);
        pm_runtime_set_suspended(&pdev->dev);
 
        clk_disable_unprepare(spi_imx->clk_ipg);