]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: orion: fix controller deregistration
authorJohan Hovold <johan@kernel.org>
Tue, 14 Apr 2026 13:43:17 +0000 (15:43 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 20 Apr 2026 11:39:29 +0000 (12:39 +0100)
Make sure to deregister the controller before disabling underlying
resources like clocks during driver unbind.

Fixes: 60cadec9da7b ("spi: new orion_spi driver")
Cc: stable@vger.kernel.org # 2.6.27
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260414134319.978196-7-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-orion.c

index 7a2186b51b4ccf81ae4821f0ff10bfdb70f57b77..c54cd4ef09bdbb9f6d86660a0f2cc0878fd1e7f3 100644 (file)
@@ -801,10 +801,15 @@ static void orion_spi_remove(struct platform_device *pdev)
        struct spi_controller *host = platform_get_drvdata(pdev);
        struct orion_spi *spi = spi_controller_get_devdata(host);
 
+       spi_controller_get(host);
+
+       spi_unregister_controller(host);
+
        pm_runtime_get_sync(&pdev->dev);
        clk_disable_unprepare(spi->axi_clk);
 
-       spi_unregister_controller(host);
+       spi_controller_put(host);
+
        pm_runtime_disable(&pdev->dev);
 }