summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2011-01-12 15:39:09 +0100
committerDan Williams <dan.j.williams@intel.com>2011-01-14 16:54:44 -0800
commit568f7f0c2e597671d3e646e0b85c95c4a5756fef (patch)
tree919c1003e73ee4e815dff0276a1dc73a0780516f /drivers/dma
parent93d0bec2be4b0f036a27da207ecab97fc3d3bbbe (diff)
downloadlinux-stable-568f7f0c2e597671d3e646e0b85c95c4a5756fef.tar.gz
linux-stable-568f7f0c2e597671d3e646e0b85c95c4a5756fef.tar.bz2
linux-stable-568f7f0c2e597671d3e646e0b85c95c4a5756fef.zip
dmaengine: at_hdmac: flags located in first descriptor
Place flags on first descriptor of chain instead of last. This is the one used by atc_chain_complete() function while unmapping. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/at_hdmac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index e25c4ad01062..3938db210834 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -603,7 +603,7 @@ atc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
/* set end-of-link to the last link descriptor of list*/
set_desc_eol(desc);
- desc->txd.flags = flags; /* client is in control of this ack */
+ first->txd.flags = flags; /* client is in control of this ack */
return &first->txd;
@@ -748,8 +748,8 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
first->txd.cookie = -EBUSY;
first->len = total_len;
- /* last link descriptor of list is responsible of flags */
- prev->txd.flags = flags; /* client is in control of this ack */
+ /* first link descriptor of list is responsible of flags */
+ first->txd.flags = flags; /* client is in control of this ack */
return &first->txd;