Unverified Commit 123d17db authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

spi: sprd: fix controller deregistration 



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

Note that the controller is suspended before disabling and releasing
resources since commit de082d86 ("spi: sprd: Add the SPI irq
function for the SPI DMA mode") which avoids issues like unclocked
accesses but prevents SPI device drivers from doing I/O during
deregistration.

Fixes: e7d973a3 ("spi: sprd: Add SPI driver for Spreadtrum SC9860")
Cc: stable@vger.kernel.org	# 4.20
Cc: Lanqing Liu <lanqing.liu@spreadtrum.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-17-johan@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ab840cbd

drivers/spi/spi-sprd.c

+6 −2
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ static int sprd_spi_probe(struct platform_device *pdev) 
		goto err_rpm_put;

	}



	ret = devm_spi_register_controller(&pdev->dev, sctlr);

	ret = spi_register_controller(sctlr);

	if (ret)

		goto err_rpm_put;
@@ -1008,7 +1008,9 @@ static void sprd_spi_remove(struct platform_device *pdev) 
	if (ret < 0)

		dev_err(ss->dev, "failed to resume SPI controller\n");



	spi_controller_suspend(sctlr);

	spi_controller_get(sctlr);



	spi_unregister_controller(sctlr);



	if (ret >= 0) {

		if (ss->dma.enable)
@@ -1017,6 +1019,8 @@ static void sprd_spi_remove(struct platform_device *pdev) 
	}

	pm_runtime_put_noidle(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	spi_controller_put(sctlr);

}



static int __maybe_unused sprd_spi_runtime_suspend(struct device *dev)