diff options
author | Shawn Guo <shawn.guo@freescale.com> | 2011-01-19 16:50:36 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-31 06:41:50 -0500 |
commit | 4b2ce9ddb370c4eb573540611c347d78ac4b54a0 (patch) | |
tree | c4fa0f7baab20d7990ca4b2628af6f60ac249386 /drivers/dma | |
parent | 1797c33f0edcdcc9a483c06233a203786666a97f (diff) |
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/dma')
-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 cf8cc0b8e7f7..6fc04d85be6b 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( | |||
947 | 947 | ||
948 | return &sdmac->desc; | 948 | return &sdmac->desc; |
949 | err_out: | 949 | err_out: |
950 | sdmac->status = DMA_ERROR; | ||
950 | return NULL; | 951 | return NULL; |
951 | } | 952 | } |
952 | 953 | ||