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

spi: rspi: fix controller deregistration 



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

Fixes: 9e03d05e ("spi: rcar: Use devm_spi_register_master()")
Cc: stable@vger.kernel.org	# 3.14
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-11-johan@kernel.org


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

drivers/spi/spi-rspi.c

+8 −2
Original line number Diff line number Diff line
@@ -1171,8 +1171,14 @@ static void rspi_remove(struct platform_device *pdev) 
{

	struct rspi_data *rspi = platform_get_drvdata(pdev);



	spi_controller_get(rspi->ctlr);



	spi_unregister_controller(rspi->ctlr);



	rspi_release_dma(rspi->ctlr);

	pm_runtime_disable(&pdev->dev);



	spi_controller_put(rspi->ctlr);

}



static const struct spi_ops rspi_ops = {
@@ -1376,9 +1382,9 @@ static int rspi_probe(struct platform_device *pdev) 
	if (ret < 0)

		dev_warn(&pdev->dev, "DMA not available, using PIO\n");



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

	ret = spi_register_controller(ctlr);

	if (ret < 0) {

		dev_err(&pdev->dev, "devm_spi_register_controller error.\n");

		dev_err(&pdev->dev, "failed to register controller\n");

		goto error3;

	}