---

yaml --- r: 57401 b: refs/heads/master c: fbd5604 h: refs/heads/master i: 57399: 1de4523 v: v3
git-mirror · Jun 6, 2007 · 4011673 · 4011673
1 parent 897bd4f
commit 4011673
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fe5f2c4503cf45806a47c608706fc7892649d4b
+refs/heads/master: fbd5604d56c4543457aeae6dda69c9b8a1405474
diff --git a/trunk/arch/mips/mm/dma-default.c b/trunk/arch/mips/mm/dma-default.c
@@ -168,8 +168,9 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 		addr = (unsigned long) page_address(sg->page);
 		if (!plat_device_is_coherent(dev) && addr)
 			__dma_sync(addr + sg->offset, sg->length, direction);
-		sg->dma_address = plat_map_dma_mem_page(dev, sg->page) +
-		                  sg->offset;
+		sg->dma_address = plat_map_dma_mem(dev,
+				                   (void *)(addr + sg->offset),
+						   sg->length);
 	}
 
 	return nents;