spi: octeon: fix controller deregistration

Make sure to deregister the controller before disabling it to avoid
hanging or leaking resources associated with the queue when the queue is
non-empty.

Fixes: 22ad2d8df77d ("spi: octeon: 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/20260409120419.388546-9-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-cavium-octeon.c b/drivers/spi/spi-cavium-octeon.c
index 155085a053a1095d4ad2e07352e499344978cf16..b95bfa6a301327dddef1bb0996af921884252558 100644 (file)
--- a/drivers/spi/spi-cavium-octeon.c
+++ b/drivers/spi/spi-cavium-octeon.c
@@ -54,7 +54,7 @@ static int octeon_spi_probe(struct platform_device *pdev)
        host->bits_per_word_mask = SPI_BPW_MASK(8);
        host->max_speed_hz = OCTEON_SPI_MAX_CLOCK_HZ;
 
-       err = devm_spi_register_controller(&pdev->dev, host);
+       err = spi_register_controller(host);
        if (err) {
                dev_err(&pdev->dev, "register host failed: %d\n", err);
                goto fail;
@@ -73,8 +73,14 @@ static void octeon_spi_remove(struct platform_device *pdev)
        struct spi_controller *host = platform_get_drvdata(pdev);
        struct octeon_spi *p = spi_controller_get_devdata(host);
 
+       spi_controller_get(host);
+
+       spi_unregister_controller(host);
+
        /* Clear the CSENA* and put everything in a known state. */
        writeq(0, p->register_base + OCTEON_SPI_CFG(p));
+
+       spi_controller_put(host);
 }
 
 static const struct of_device_id octeon_spi_match[] = {