diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2011-05-06 19:56:51 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-05-09 08:12:45 +0200 |
| commit | 543aabc7d295bfe2489f184259395e3467520d48 (patch) | |
| tree | dea913d2242b7aa5530616c428d79cfdcd06b6e6 | |
| parent | dmaengine/ste_dma40: fix introduced warnings (diff) | |
| download | linux-543aabc7d295bfe2489f184259395e3467520d48.tar.xz linux-543aabc7d295bfe2489f184259395e3467520d48.zip | |
dmaengine: at_hdmac: set residue as total len in atc_tx_status
If transfer status is !=DMA_SUCCESS, return total transfer len as residue,
instead of zero.
Idea from dw_dmac patch by Viresh Kumar.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | drivers/dma/at_hdmac.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index f52c9e38d889..ba0b5ec4e4c2 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c @@ -1026,7 +1026,12 @@ atc_tx_status(struct dma_chan *chan, spin_unlock_bh(&atchan->lock); - dma_set_tx_state(txstate, last_complete, last_used, 0); + if (ret != DMA_SUCCESS) + dma_set_tx_state(txstate, last_complete, last_used, + atc_first_active(atchan)->len); + else + dma_set_tx_state(txstate, last_complete, last_used, 0); + dev_vdbg(chan2dev(chan), "tx_status: %d (d%d, u%d)\n", cookie, last_complete ? last_complete : 0, last_used ? last_used : 0); |