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

spi: sun6i: fix controller deregistration 



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

Fixes: 3558fe90 ("spi: sunxi: Add Allwinner A31 SPI controller driver")
Cc: stable@vger.kernel.org	# 3.15
Cc: Maxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-20-johan@kernel.org


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

drivers/spi/spi-sun6i.c

+7 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static int sun6i_spi_probe(struct platform_device *pdev) 
	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);



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

	ret = spi_register_controller(host);

	if (ret) {

		dev_err(&pdev->dev, "cannot register SPI host\n");

		goto err_pm_disable;
@@ -768,12 +768,18 @@ static void sun6i_spi_remove(struct platform_device *pdev) 
{

	struct spi_controller *host = platform_get_drvdata(pdev);



	spi_controller_get(host);



	spi_unregister_controller(host);



	pm_runtime_force_suspend(&pdev->dev);



	if (host->dma_tx)

		dma_release_channel(host->dma_tx);

	if (host->dma_rx)

		dma_release_channel(host->dma_rx);



	spi_controller_put(host);

}



static const struct sun6i_spi_cfg sun6i_a31_spi_cfg = {