From 4eba25fe0e4bc402232db8d86600a19c822d120d Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Fri, 22 Jun 2012 20:41:10 +0530 Subject: [PATCH] --- yaml --- r: 316646 b: refs/heads/master c: 597c854974db20eebe87e91df0d12daaefabf525 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/tegra20-apb-dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 01fc1eb9464e..b4cc3d0a0fc6 100644 --- 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 index 134ea7cfc795..6d7d5d383cb1 100644 --- 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) ||