aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2010-12-15 18:50:16 +0100
committerDan Williams <dan.j.williams@intel.com>2011-01-14 16:25:58 -0800
commit0f70e8cea3ac6a765289811c590a16934bf47711 (patch)
tree8e7800effeaf4a37080744f7694f9f1c5677179e
parent2cdf2455a660ea860272ef3f833f0e5c4cc80205 (diff)
downloadkernel_samsung_tuna-0f70e8cea3ac6a765289811c590a16934bf47711.zip
kernel_samsung_tuna-0f70e8cea3ac6a765289811c590a16934bf47711.tar.gz
kernel_samsung_tuna-0f70e8cea3ac6a765289811c590a16934bf47711.tar.bz2
dmaengine: at_hdmac: use dma_address to program DMA hardware
In atc_prep_slave_sg() function we use dma_address field of scatterlist with sg_dma_address() macro instead of sg_phys(). DMA address is already computed by dma_map_sg() or another mapping function in calling driver. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/dma/at_hdmac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index a0f3e6a..6eea888 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -670,7 +670,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
if (!desc)
goto err_desc_get;
- mem = sg_phys(sg);
+ mem = sg_dma_address(sg);
len = sg_dma_len(sg);
mem_width = 2;
if (unlikely(mem & 3 || len & 3))
@@ -712,7 +712,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
if (!desc)
goto err_desc_get;
- mem = sg_phys(sg);
+ mem = sg_dma_address(sg);
len = sg_dma_len(sg);
mem_width = 2;
if (unlikely(mem & 3 || len & 3))