]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: syncuacer: fix controller deregistration
authorJohan Hovold <johan@kernel.org>
Fri, 10 Apr 2026 08:17:50 +0000 (10:17 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 10 Apr 2026 12:22:40 +0000 (13:22 +0100)
Make sure to deregister the controller before disabling underlying
resources like clocks during driver unbind.

Fixes: b0823ee35cf9 ("spi: Add spi driver for Socionext SynQuacer platform")
Cc: stable@vger.kernel.org # 5.3
Cc: Masahisa Kojima <masahisa.kojima@linaro.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-21-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-synquacer.c

index d0a875249910da2a993f65fea494a733d178946a..290c439897c4ff1467bd909ea96f5964ec50b708 100644 (file)
@@ -716,7 +716,7 @@ static int synquacer_spi_probe(struct platform_device *pdev)
        pm_runtime_set_active(sspi->dev);
        pm_runtime_enable(sspi->dev);
 
-       ret = devm_spi_register_controller(sspi->dev, host);
+       ret = spi_register_controller(host);
        if (ret)
                goto disable_pm;
 
@@ -737,9 +737,15 @@ static void synquacer_spi_remove(struct platform_device *pdev)
        struct spi_controller *host = platform_get_drvdata(pdev);
        struct synquacer_spi *sspi = spi_controller_get_devdata(host);
 
+       spi_controller_get(host);
+
+       spi_unregister_controller(host);
+
        pm_runtime_disable(sspi->dev);
 
        clk_disable_unprepare(sspi->clk);
+
+       spi_controller_put(host);
 }
 
 static int __maybe_unused synquacer_spi_suspend(struct device *dev)