]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: spi-fsl-lpspi: Reset FIFO and disable module on transfer abort
authorLarisa Grigore <larisa.grigore@nxp.com>
Thu, 28 Aug 2025 10:14:42 +0000 (11:14 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 1 Sep 2025 12:12:25 +0000 (13:12 +0100)
In DMA mode fsl_lpspi_reset() is always called at the end, even when the
transfer is aborted. In PIO mode aborts skip the reset leaving the FIFO
filled and the module enabled.

Fix it by always calling fsl_lpspi_reset().

Fixes: a15dc3d657fa ("spi: lpspi: Fix CLK pin becomes low before one transfer")
Signed-off-by: Larisa Grigore <larisa.grigore@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: James Clark <james.clark@linaro.org>
Link: https://patch.msgid.link/20250828-james-nxp-lpspi-v2-3-6262b9aa9be4@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-fsl-lpspi.c

index 5ea4a306ffa6abf9830a9956033c7bfedca319a9..e50261e9a1fa00e7e94092b25ffe85adf84984e7 100644 (file)
@@ -733,12 +733,10 @@ static int fsl_lpspi_pio_transfer(struct spi_controller *controller,
        fsl_lpspi_write_tx_fifo(fsl_lpspi);
 
        ret = fsl_lpspi_wait_for_completion(controller);
-       if (ret)
-               return ret;
 
        fsl_lpspi_reset(fsl_lpspi);
 
-       return 0;
+       return ret;
 }
 
 static int fsl_lpspi_transfer_one(struct spi_controller *controller,