spi: pl022: fix controller deregistration

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

Fixes: b43d65f7e818 ("[ARM] 5546/1: ARM PL022 SSP/SPI driver v3")
Cc: stable@vger.kernel.org	# 2.6.31
Cc: Linus Walleij <linusw@kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-9-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index bd1d28caa51e7f5a36d7ce705e131a09fb5aa886..9c0211f94fd07c47375d407065f7333986b05937 100644 (file)
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -1956,7 +1956,7 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
 
        /* Register with the SPI framework */
        amba_set_drvdata(adev, pl022);
-       status = devm_spi_register_controller(&adev->dev, host);
+       status = spi_register_controller(host);
        if (status != 0) {
                dev_err_probe(&adev->dev, status,
                              "problem registering spi host\n");
@@ -1997,6 +1997,10 @@ pl022_remove(struct amba_device *adev)
        if (!pl022)
                return;
 
+       spi_controller_get(pl022->host);
+
+       spi_unregister_controller(pl022->host);
+
        /*
         * undo pm_runtime_put() in probe.  I assume that we're not
         * accessing the primecell here.
@@ -2008,6 +2012,8 @@ pl022_remove(struct amba_device *adev)
                pl022_dma_remove(pl022);
 
        amba_release_regions(adev);
+
+       spi_controller_put(pl022->host);
 }
 
 #ifdef CONFIG_PM_SLEEP