From d3fb13dd46ac48ec7104852ba6709fe71c142c3c Mon Sep 17 00:00:00 2001 From: David Daney Date: Fri, 17 Oct 2008 17:48:53 -0700 Subject: [PATCH] --- yaml --- r: 117894 b: refs/heads/master c: f67ae98352284d7ac1e03f3a872e33c68ea35a5b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/mm/dma-default.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1494d3aea9e1..ad6f1da72f3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b517531ce53794f2a2eae1fff1d1216b9db4da9f +refs/heads/master: f67ae98352284d7ac1e03f3a872e33c68ea35a5b diff --git a/trunk/arch/mips/mm/dma-default.c b/trunk/arch/mips/mm/dma-default.c index 891312f8e5a6..5b98d0e731c2 100644 --- a/trunk/arch/mips/mm/dma-default.c +++ b/trunk/arch/mips/mm/dma-default.c @@ -324,7 +324,6 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, if (cpu_is_noncoherent_r10000(dev)) __dma_sync((unsigned long)page_address(sg_page(sg)), sg->length, direction); - plat_unmap_dma_mem(sg->dma_address); } } @@ -342,7 +341,6 @@ void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele if (!plat_device_is_coherent(dev)) __dma_sync((unsigned long)page_address(sg_page(sg)), sg->length, direction); - plat_unmap_dma_mem(sg->dma_address); } }