Skip to content

Commit 42108a2

Browse files
jhovoldbroonie
authored andcommitted
spi: sun4i: fix controller deregistration
Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: b5f6517 ("spi: sunxi: Add Allwinner A10 SPI controller driver") Cc: stable@vger.kernel.org # 3.15 Cc: Maxime Ripard <mripard@kernel.org> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410081757.503099-19-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 1985737 commit 42108a2

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

drivers/spi/spi-sun4i.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ static int sun4i_spi_probe(struct platform_device *pdev)
504504
pm_runtime_enable(&pdev->dev);
505505
pm_runtime_idle(&pdev->dev);
506506

507-
ret = devm_spi_register_controller(&pdev->dev, host);
507+
ret = spi_register_controller(host);
508508
if (ret) {
509509
dev_err(&pdev->dev, "cannot register SPI host\n");
510510
goto err_pm_disable;
@@ -522,7 +522,15 @@ static int sun4i_spi_probe(struct platform_device *pdev)
522522

523523
static void sun4i_spi_remove(struct platform_device *pdev)
524524
{
525+
struct spi_controller *host = platform_get_drvdata(pdev);
526+
527+
spi_controller_get(host);
528+
529+
spi_unregister_controller(host);
530+
525531
pm_runtime_force_suspend(&pdev->dev);
532+
533+
spi_controller_put(host);
526534
}
527535

528536
static const struct of_device_id sun4i_spi_match[] = {

0 commit comments

Comments
 (0)