Commit 44968466 authored Oct 14, 2012 by Marek Vasut Committed by Mark Brown Oct 17, 2012

spi: mxs: Terminate DMA in case of DMA timeout



In case the SPI DMA times out, the DMA might still be in some kind of
inconsistent state. Issue dmaengine_terminate_all() on the particular
channel to kill off all operations before continuing.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent d856f1eb

drivers/spi/spi-mxs.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -323,6 +323,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
	if (!ret) {		if (!ret) {
	dev_err(ssp->dev, "DMA transfer timeout\n");		dev_err(ssp->dev, "DMA transfer timeout\n");
	ret = -ETIMEDOUT;		ret = -ETIMEDOUT;
			dmaengine_terminate_all(ssp->dmach);
	goto err_vmalloc;		goto err_vmalloc;
	}		}