diff options
| author | Shawn Guo <shawn.guo@freescale.com> | 2011-01-20 05:50:36 +0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-31 12:41:50 +0100 |
| commit | 4b2ce9ddb370c4eb573540611c347d78ac4b54a0 (patch) | |
| tree | c4fa0f7baab20d7990ca4b2628af6f60ac249386 /drivers | |
| parent | 1797c33f0edcdcc9a483c06233a203786666a97f (diff) | |
| download | linux-3.10-4b2ce9ddb370c4eb573540611c347d78ac4b54a0.tar.gz linux-3.10-4b2ce9ddb370c4eb573540611c347d78ac4b54a0.tar.bz2 linux-3.10-4b2ce9ddb370c4eb573540611c347d78ac4b54a0.zip | |
dmaengine: imx-sdma: set sdmac->status to DMA_ERROR in err_out of sdma_prep_slave_sg()
sdma_prep_dma_cyclic() sets sdmac->status to DMA_ERROR in err_out,
and sdma_prep_slave_sg() needs to do the same. Otherwise,
sdmac->status stays at DMA_IN_PROGRESS, which will make the function
return immediately next time it gets called.
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index cf8cc0b8e7f..6fc04d85be6 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -947,6 +947,7 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg( return &sdmac->desc; err_out: + sdmac->status = DMA_ERROR; return NULL; } |