spi: mxs: fix controller deregistration

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

Fixes: 33e195acf268 ("spi: mxs: use devm_spi_register_master()")
Cc: stable@vger.kernel.org	# 3.13
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-4-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index b3301c69e2deb221ed208558f8048bc5b0ad36d6..0164e04d59a10217dc23ac740b508a6d8339405c 100644 (file)
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -619,7 +619,7 @@ static int mxs_spi_probe(struct platform_device *pdev)
        if (ret)
                goto out_pm_runtime_put;
 
-       ret = devm_spi_register_controller(&pdev->dev, host);
+       ret = spi_register_controller(host);
        if (ret) {
                dev_err(&pdev->dev, "Cannot register SPI host, %d\n", ret);
                goto out_pm_runtime_put;
@@ -650,11 +650,17 @@ static void mxs_spi_remove(struct platform_device *pdev)
        spi = spi_controller_get_devdata(host);
        ssp = &spi->ssp;
 
+       spi_controller_get(host);
+
+       spi_unregister_controller(host);
+
        pm_runtime_disable(&pdev->dev);
        if (!pm_runtime_status_suspended(&pdev->dev))
                mxs_spi_runtime_suspend(&pdev->dev);
 
        dma_release_channel(ssp->dmach);
+
+       spi_controller_put(host);
 }
 
 static struct platform_driver mxs_spi_driver = {