---

yaml --- r: 316646 b: refs/heads/master c: 597c854 h: refs/heads/master v: v3
git-mirror · Jun 27, 2012 · 4eba25f · 4eba25f
1 parent 7e17f36
commit 4eba25f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49d57b5e588ce511bd826f5759aa2aebf322626b
+refs/heads/master: 597c854974db20eebe87e91df0d12daaefabf525
diff --git a/trunk/drivers/dma/tegra20-apb-dma.c b/trunk/drivers/dma/tegra20-apb-dma.c
@@ -929,7 +929,7 @@ static struct dma_async_tx_descriptor *tegra_dma_prep_slave_sg(
 	for_each_sg(sgl, sg, sg_len, i) {
 		u32 len, mem;
 
-		mem = sg_phys(sg);
+		mem = sg_dma_address(sg);
 		len = sg_dma_len(sg);
 
 		if ((len & 3) || (mem & 3) ||