Unverified Commit c6cb3815 authored Oct 08, 2020 by Serge Semin Committed by Mark Brown Oct 08, 2020

spi: dw: Discard chip enabling on DMA setup error

It's pointless to enable the chip back if the DMA setup procedure fails,
since we'll disable it on the next transfer anyway. For the same reason We
don't do that in case of a failure detected in any other methods called
from the transfer_one() method.

While at it consider any non-zero value returned from the dma_setup
callback to be erroneous as it's supposed to be in the kernel.

Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Link: https://lore.kernel.org/r/20201007235511.4935-13-Sergey.Semin@baikalelectronics.ru

Signed-off-by: Mark Brown <broonie@kernel.org>

parent da8f5890

drivers/spi/spi-dw-core.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -372,11 +372,9 @@ static int dw_spi_transfer_one(struct spi_controller *master,

		if (dws->dma_mapped) {
		ret = dws->dma_ops->dma_setup(dws, transfer);
		if (ret < 0) {
		spi_enable_chip(dws, 1);
		if (ret)
		return ret;
		}
		}

		spi_enable_chip(dws, 1);