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/ppc4xx/adma.c | |
parent | b967aecf1714c10d1e6c045e43b6385884f1ca77 (diff) | |
parent | 7db5f7274a0b065abdc358be2a44b4a911d75707 (diff) |
Merge branch 'dma_complete' into next
Diffstat (limited to 'drivers/dma/ppc4xx/adma.c')
-rw-r--r-- | drivers/dma/ppc4xx/adma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c index 370ff8265630..60e02ae38b04 100644 --- a/drivers/dma/ppc4xx/adma.c +++ b/drivers/dma/ppc4xx/adma.c @@ -3891,7 +3891,7 @@ static enum dma_status ppc440spe_adma_tx_status(struct dma_chan *chan, ppc440spe_chan = to_ppc440spe_adma_chan(chan); ret = dma_cookie_status(chan, cookie, txstate); - if (ret == DMA_SUCCESS) + if (ret == DMA_COMPLETE) return ret; ppc440spe_adma_slot_cleanup(ppc440spe_chan); |