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/dw | |
| parent | b967aecf1714c10d1e6c045e43b6385884f1ca77 (diff) | |
| parent | 7db5f7274a0b065abdc358be2a44b4a911d75707 (diff) | |
Merge branch 'dma_complete' into next
Diffstat (limited to 'drivers/dma/dw')
| -rw-r--r-- | drivers/dma/dw/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c index 89eb89f22284..2c29331571e4 100644 --- a/drivers/dma/dw/core.c +++ b/drivers/dma/dw/core.c | |||
| @@ -1098,13 +1098,13 @@ dwc_tx_status(struct dma_chan *chan, | |||
| 1098 | enum dma_status ret; | 1098 | enum dma_status ret; |
| 1099 | 1099 | ||
| 1100 | ret = dma_cookie_status(chan, cookie, txstate); | 1100 | ret = dma_cookie_status(chan, cookie, txstate); |
| 1101 | if (ret == DMA_SUCCESS) | 1101 | if (ret == DMA_COMPLETE) |
| 1102 | return ret; | 1102 | return ret; |
| 1103 | 1103 | ||
| 1104 | dwc_scan_descriptors(to_dw_dma(chan->device), dwc); | 1104 | dwc_scan_descriptors(to_dw_dma(chan->device), dwc); |
| 1105 | 1105 | ||
| 1106 | ret = dma_cookie_status(chan, cookie, txstate); | 1106 | ret = dma_cookie_status(chan, cookie, txstate); |
| 1107 | if (ret != DMA_SUCCESS) | 1107 | if (ret != DMA_COMPLETE) |
| 1108 | dma_set_residue(txstate, dwc_get_residue(dwc)); | 1108 | dma_set_residue(txstate, dwc_get_residue(dwc)); |
| 1109 | 1109 | ||
| 1110 | if (dwc->paused && ret == DMA_IN_PROGRESS) | 1110 | if (dwc->paused && ret == DMA_IN_PROGRESS) |