From: Krzysztof Kozlowski <k...@kernel.org>

[ Upstream commit 7684580d45bd3d84ed9b453a4cadf7a9a5605a3f ]

During device removal, the driver should unregister the SPI controller
and stop the hardware.  Otherwise the dspi_transfer_one_message() could
wait on completion infinitely.

Additionally, calling spi_unregister_controller() first in device
removal reverse-matches the probe function, where SPI controller is
registered at the end.

Fixes: 05209f457069 ("spi: fsl-dspi: add missing clk_disable_unprepare() in 
dspi_remove()")
Reported-by: Vladimir Oltean <olte...@gmail.com>
Signed-off-by: Krzysztof Kozlowski <k...@kernel.org>
Cc: <sta...@vger.kernel.org>
Link: https://lore.kernel.org/r/20200622110543.5035-1-k...@kernel.org
Signed-off-by: Mark Brown <broo...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/spi/spi-fsl-dspi.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 89d403dfb3bdf..38d337f0967db 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -1441,11 +1441,20 @@ static int dspi_remove(struct platform_device *pdev)
        struct fsl_dspi *dspi = spi_controller_get_devdata(ctlr);
 
        /* Disconnect from the SPI framework */
+       spi_unregister_controller(dspi->ctlr);
+
+       /* Disable RX and TX */
+       regmap_update_bits(dspi->regmap, SPI_MCR,
+                          SPI_MCR_DIS_TXF | SPI_MCR_DIS_RXF,
+                          SPI_MCR_DIS_TXF | SPI_MCR_DIS_RXF);
+
+       /* Stop Running */
+       regmap_update_bits(dspi->regmap, SPI_MCR, SPI_MCR_HALT, SPI_MCR_HALT);
+
        dspi_release_dma(dspi);
        if (dspi->irq)
                free_irq(dspi->irq, dspi);
        clk_disable_unprepare(dspi->clk);
-       spi_unregister_controller(dspi->ctlr);
 
        return 0;
 }
-- 
2.25.1



Reply via email to