MIPS: Don't unmap the memory for dma_sync*.
authorDavid Daney <ddaney@caviumnetworks.com>
Sat, 18 Oct 2008 00:48:53 +0000 (17:48 -0700)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 27 Oct 2008 16:18:25 +0000 (16:18 +0000)
We were getting away with this for so long only because the only platform
with a non-empty plat_unmap_dma_mem() doesn't call dma_sync_sg_for_cpu()
and dma_sync_sg_for_device() from its commonly used drivers.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mm/dma-default.c

index 891312f8e5a6b19d01b6485cda535821520e346c..5b98d0e731c2238ae0f8ff64d3a3d139aa4ef562 100644 (file)
@@ -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);
        }
 }