diff options
| author |   Cyrille Pitchen <cyrille.pitchen@atmel.com> | 2014-11-13 11:52:42 +0100 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@intel.com> | 2014-11-17 14:07:20 +0530 |
| commit | 57819276db8ae06e231b884377b75860f267d984 (patch) | |
| tree | 5ef3c0bd360f0390ba4d60895ae938ae19a80c22 /drivers/dma | |
| parent | dmaengine: at_xdmac: fix software lockup at_xdmac_tx_status() (diff) | |
| download | linux-dev-57819276db8ae06e231b884377b75860f267d984.tar.xz linux-dev-57819276db8ae06e231b884377b75860f267d984.zip | |
dmaengine: at_xdmac: fix a bug in transfer residue computation
The total size of the transfer was wrong in at_xdmac_prep_slave_sg()
resulting in bad computation of the transfer residue by
at_xdmac_tx_status().
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/at_xdmac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index fa9d75adf4d7..bf2aacbbf4cc 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -562,6 +562,7 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, struct scatterlist *sg; int i; u32 cfg; + unsigned int xfer_size = 0; if (!sgl) return NULL; @@ -637,12 +638,13 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, dev_dbg(chan2dev(chan), "%s: add desc 0x%p to descs_list 0x%p\n", __func__, desc, first); list_add_tail(&desc->desc_node, &first->descs_list); + xfer_size += len; } spin_unlock_bh(&atchan->lock); first->tx_dma_desc.flags = flags; - first->xfer_size = sg_len; + first->xfer_size = xfer_size; first->direction = direction; return &first->tx_dma_desc; |