Skip to content

Commit 0793882

Browse files
jhovoldgregkh
authored andcommitted
spi: amlogic-spisg: fix controller deregistration
commit 84d31bb upstream. Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: cef9991 ("spi: Add Amlogic SPISG driver") Cc: stable@vger.kernel.org # 6.17: b8db955 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6047dc5 commit 0793882

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/spi/spi-amlogic-spisg.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ static int aml_spisg_probe(struct platform_device *pdev)
801801
goto out_clk;
802802
}
803803

804-
ret = devm_spi_register_controller(dev, ctlr);
804+
ret = spi_register_controller(ctlr);
805805
if (ret) {
806806
dev_err(&pdev->dev, "spi controller registration failed\n");
807807
goto out_clk;
@@ -824,6 +824,8 @@ static void aml_spisg_remove(struct platform_device *pdev)
824824
{
825825
struct spisg_device *spisg = platform_get_drvdata(pdev);
826826

827+
spi_unregister_controller(spisg->controller);
828+
827829
if (!pm_runtime_suspended(&pdev->dev)) {
828830
pinctrl_pm_select_sleep_state(&spisg->pdev->dev);
829831
clk_disable_unprepare(spisg->core);

0 commit comments

Comments
 (0)