spi: amlogic-spisg: fix controller deregistration

Make sure to deregister the controller before disabling underlying
resources like clocks during driver unbind.

Fixes: cef9991e04ae ("spi: Add Amlogic SPISG driver")
Cc: stable@vger.kernel.org	# 6.17: b8db95529979
Cc: stable@vger.kernel.org	# 6.17
Cc: Sunny Luo <sunny.luo@amlogic.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260409120419.388546-2-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-amlogic-spisg.c b/drivers/spi/spi-amlogic-spisg.c
index da8ec35115da5fd25ad0289d05d64e79ea0ab1e3..19c5eba412ef4ca4de12a61c2c1e44f4f9f85762 100644 (file)
--- a/drivers/spi/spi-amlogic-spisg.c
+++ b/drivers/spi/spi-amlogic-spisg.c
@@ -800,7 +800,7 @@ static int aml_spisg_probe(struct platform_device *pdev)
                goto out_clk;
        }
 
-       ret = devm_spi_register_controller(dev, ctlr);
+       ret = spi_register_controller(ctlr);
        if (ret) {
                dev_err(&pdev->dev, "spi controller registration failed\n");
                goto out_clk;
@@ -823,6 +823,8 @@ static void aml_spisg_remove(struct platform_device *pdev)
 {
        struct spisg_device *spisg = platform_get_drvdata(pdev);
 
+       spi_unregister_controller(spisg->controller);
+
        if (!pm_runtime_suspended(&pdev->dev)) {
                pinctrl_pm_select_sleep_state(&spisg->pdev->dev);
                clk_disable_unprepare(spisg->core);