diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2013-10-30 15:42:19 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 15:42:19 +0530 |
| commit | f0dad6e701cb66301287074c39183c7312139530 (patch) | |
| tree | b4a38d8dcc49206fcedae7192e898df1011a6810 /drivers/dma/edma.c | |
| parent | Merge branch 'for-linus' into next (diff) | |
| parent | dmaengine: remove unused DMA_SUCCESS (diff) | |
| download | linux-dev-f0dad6e701cb66301287074c39183c7312139530.tar.xz linux-dev-f0dad6e701cb66301287074c39183c7312139530.zip | |
Merge branch 'dma_complete' into next
Diffstat (limited to 'drivers/dma/edma.c')
| -rw-r--r-- | drivers/dma/edma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 8c612415867e..5dce96af9c46 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); |