summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@st.com>2011-04-15 12:33:35 +0200
committerVinod Koul <vinod.koul@intel.com>2011-05-13 16:09:55 +0200
commitabf53902dcc6d44d2e06b09817fa67857aa686fe (patch)
tree0477e3e51d0f392fec140b190aad02045fcdc3a5 /drivers/dma
parentdmaengine/dw_dmac: don't call callback routine in case dmaengine_terminate_al... (diff)
downloadlinux-abf53902dcc6d44d2e06b09817fa67857aa686fe.tar.xz
linux-abf53902dcc6d44d2e06b09817fa67857aa686fe.zip
dmaengine/dw_dmac: set residue as total len in dwc_tx_status if status is !DMA_SUCCESS
If transfer status is !=DMA_SUCCESS, return total transfer len as residue, instead of zero. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/dw_dmac.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 265d43c8b359..f209ff8835e8 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -860,7 +860,11 @@ dwc_tx_status(struct dma_chan *chan,
ret = dma_async_is_complete(cookie, last_complete, last_used);
}
- dma_set_tx_state(txstate, last_complete, last_used, 0);
+ if (ret != DMA_SUCCESS)
+ dma_set_tx_state(txstate, last_complete, last_used,
+ dwc_first_active(dwc)->len);
+ else
+ dma_set_tx_state(txstate, last_complete, last_used, 0);
return ret;
}