summaryrefslogtreecommitdiffstats
path: root/drivers/dma/imx-sdma.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@freescale.com>2011-01-19 22:50:37 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-31 12:41:59 +0100
commit8a9659114c7be6f88253618252881ea6fe0588b4 (patch)
tree4845609a6f7c48391ec1fee2a01c854590855415 /drivers/dma/imx-sdma.c
parentdmaengine: imx-sdma: set sdmac->status to DMA_ERROR in err_out of sdma_prep_s... (diff)
downloadlinux-8a9659114c7be6f88253618252881ea6fe0588b4.tar.xz
linux-8a9659114c7be6f88253618252881ea6fe0588b4.zip
dmaengine: imx-sdma: return sdmac->status in sdma_tx_status()
The sdmac->status was designed to reflect the status of the tx, so simply return it in sdma_tx_status(). Then dma client can call dma_async_is_tx_complete() to know the status of the tx. Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/dma/imx-sdma.c')
-rw-r--r--drivers/dma/imx-sdma.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 6fc04d85be6b..f331ae0f7ec3 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1061,14 +1061,12 @@ static enum dma_status sdma_tx_status(struct dma_chan *chan,
{
struct sdma_channel *sdmac = to_sdma_chan(chan);
dma_cookie_t last_used;
- enum dma_status ret;
last_used = chan->cookie;
- ret = dma_async_is_complete(cookie, sdmac->last_completed, last_used);
dma_set_tx_state(txstate, sdmac->last_completed, last_used, 0);
- return ret;
+ return sdmac->status;
}
static void sdma_issue_pending(struct dma_chan *chan)