diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 06:12:19 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 06:12:19 -0400 |
| commit | f0dad6e701cb66301287074c39183c7312139530 (patch) | |
| tree | b4a38d8dcc49206fcedae7192e898df1011a6810 /drivers/dma/edma.c | |
| parent | b967aecf1714c10d1e6c045e43b6385884f1ca77 (diff) | |
| parent | 7db5f7274a0b065abdc358be2a44b4a911d75707 (diff) | |
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, | |||
| 640 | unsigned long flags; | 640 | unsigned long flags; |
| 641 | 641 | ||
| 642 | ret = dma_cookie_status(chan, cookie, txstate); | 642 | ret = dma_cookie_status(chan, cookie, txstate); |
| 643 | if (ret == DMA_SUCCESS || !txstate) | 643 | if (ret == DMA_COMPLETE || !txstate) |
| 644 | return ret; | 644 | return ret; |
| 645 | 645 | ||
| 646 | spin_lock_irqsave(&echan->vchan.lock, flags); | 646 | spin_lock_irqsave(&echan->vchan.lock, flags); |