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

spi: s3c64xx: fix controller deregistration 



Make sure to deregister the controller before releasing underlying
resources like DMA during driver unbind.

Fixes: 91800f0e ("spi/s3c64xx: Use managed registration")
Cc: stable@vger.kernel.org	# 3.13: 76fbad41
Cc: stable@vger.kernel.org	# 3.13
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-12-johan@kernel.org


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

drivers/spi/spi-s3c64xx.c

+3 −1
Original line number Diff line number Diff line
@@ -1369,7 +1369,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,

	       sdd->regs + S3C64XX_SPI_INT_EN);



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

	ret = spi_register_controller(host);

	if (ret != 0) {

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

		goto err_pm_put;
@@ -1399,6 +1399,8 @@ static void s3c64xx_spi_remove(struct platform_device *pdev) 


	pm_runtime_get_sync(&pdev->dev);



	spi_unregister_controller(host);



	writel(0, sdd->regs + S3C64XX_SPI_INT_EN);



	if (!is_polling(sdd)) {