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

spi: meson-spicc: fix controller deregistration 



Make sure to deregister the controller before disabling it to allow SPI
device drivers to do I/O during deregistration.

Fixes: 454fa271 ("spi: Add Meson SPICC driver")
Cc: stable@vger.kernel.org	# 4.13
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260409120419.388546-18-johan@kernel.org


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

drivers/spi/spi-meson-spicc.c

+7 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ static int meson_spicc_probe(struct platform_device *pdev) 
		}

	}



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

	ret = spi_register_controller(host);

	if (ret) {

		dev_err(&pdev->dev, "spi registration failed\n");

		goto out_host;
@@ -1099,8 +1099,14 @@ static void meson_spicc_remove(struct platform_device *pdev) 
{

	struct meson_spicc_device *spicc = platform_get_drvdata(pdev);



	spi_controller_get(spicc->host);



	spi_unregister_controller(spicc->host);



	/* Disable SPI */

	writel(0, spicc->base + SPICC_CONREG);



	spi_controller_put(spicc->host);

}



static const struct meson_spicc_data meson_spicc_gx_data = {