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/amba-pl08x.c | |
| parent | b967aecf1714c10d1e6c045e43b6385884f1ca77 (diff) | |
| parent | 7db5f7274a0b065abdc358be2a44b4a911d75707 (diff) | |
| download | blackbird-op-linux-f0dad6e701cb66301287074c39183c7312139530.tar.gz blackbird-op-linux-f0dad6e701cb66301287074c39183c7312139530.zip | |
Merge branch 'dma_complete' into next
Diffstat (limited to 'drivers/dma/amba-pl08x.c')
| -rw-r--r-- | drivers/dma/amba-pl08x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 9b5025777ac8..4ee6533108f6 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -1252,7 +1252,7 @@ static enum dma_status pl08x_dma_tx_status(struct dma_chan *chan, size_t bytes = 0; ret = dma_cookie_status(chan, cookie, txstate); - if (ret == DMA_SUCCESS) + if (ret == DMA_COMPLETE) return ret; /* @@ -1267,7 +1267,7 @@ static enum dma_status pl08x_dma_tx_status(struct dma_chan *chan, spin_lock_irqsave(&plchan->vc.lock, flags); ret = dma_cookie_status(chan, cookie, txstate); - if (ret != DMA_SUCCESS) { + if (ret != DMA_COMPLETE) { vd = vchan_find_desc(&plchan->vc, cookie); if (vd) { /* On the issued list, so hasn't been processed yet */ |
