summaryrefslogtreecommitdiffstats
path: root/drivers/dma/edma.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-10-30 15:42:19 +0530
committerVinod Koul <vinod.koul@intel.com>2013-10-30 15:42:19 +0530
commitf0dad6e701cb66301287074c39183c7312139530 (patch)
treeb4a38d8dcc49206fcedae7192e898df1011a6810 /drivers/dma/edma.c
parentb967aecf1714c10d1e6c045e43b6385884f1ca77 (diff)
parent7db5f7274a0b065abdc358be2a44b4a911d75707 (diff)
downloadop-kernel-dev-f0dad6e701cb66301287074c39183c7312139530.zip
op-kernel-dev-f0dad6e701cb66301287074c39183c7312139530.tar.gz
Merge branch 'dma_complete' into next
Diffstat (limited to 'drivers/dma/edma.c')
-rw-r--r--drivers/dma/edma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index 8c61241..5dce96a 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -640,7 +640,7 @@ static enum dma_status edma_tx_status(struct dma_chan *chan,
unsigned long flags;
ret = dma_cookie_status(chan, cookie, txstate);
- if (ret == DMA_SUCCESS || !txstate)
+ if (ret == DMA_COMPLETE || !txstate)
return ret;
spin_lock_irqsave(&echan->vchan.lock, flags);
OpenPOWER on IntegriCloud