diff options
| author | Johan Hovold <johan@kernel.org> | 2026-04-09 15:04:00 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-04-09 22:07:59 +0300 |
| commit | 84d31bb1f6256eea0db6cf64a3c7a53145f92bb9 (patch) | |
| tree | 136bd36418e9fea0ff65d77fa5415b8dfe216496 | |
| parent | 48c0d3c6a4a2e32c5acccd1129896b33a1f5046b (diff) | |
| download | linux-84d31bb1f6256eea0db6cf64a3c7a53145f92bb9.tar.xz | |
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>
| -rw-r--r-- | drivers/spi/spi-amlogic-spisg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-amlogic-spisg.c b/drivers/spi/spi-amlogic-spisg.c index da8ec35115da..19c5eba412ef 100644 --- 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); |