]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: imx: Propagate prepare_transfer() error from spi_imx_setupxfer()
authorJohn Madieu <john.madieu@gmail.com>
Fri, 1 May 2026 13:59:51 +0000 (13:59 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 4 May 2026 13:22:16 +0000 (22:22 +0900)
spi_imx_setupxfer() calls the per-variant prepare_transfer()
callback and returns 0 unconditionally:

spi_imx->devtype_data->prepare_transfer(spi_imx, spi, t);

return 0;

mx51_ecspi_prepare_transfer() can return -EINVAL when the requested
word_delay does not fit in MX51_ECSPI_PERIOD_MASK. The error is
detected after a partial set of register writes (CTRL: BL, clkdiv,
SMC), so the controller is left in a partially-configured state and
the transfer is then submitted as if setup succeeded.

Propagate the return value. The other variants' prepare_transfer
callbacks all return 0, so this is a no-op for them.

Fixes: a3bb4e663df3 ("spi: imx: support word delay")
Signed-off-by: John Madieu <john.madieu@gmail.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260501135951.2416527-4-john.madieu@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-imx.c

index 4e3dbd01d6191ef69eca5e8f0817efe183ab9c30..480d1e8b281f194f6d69e38bc8f7594e6fcbfbaf 100644 (file)
@@ -1382,9 +1382,7 @@ static int spi_imx_setupxfer(struct spi_device *spi,
                spi_imx->target_burst = t->len;
        }
 
-       spi_imx->devtype_data->prepare_transfer(spi_imx, spi, t);
-
-       return 0;
+       return spi_imx->devtype_data->prepare_transfer(spi_imx, spi, t);
 }
 
 static void spi_imx_sdma_exit(struct spi_imx_data *spi_imx)