[ARM] dma: don't touch cache on dma_*_for_cpu()

[linux-2.6-omap-h63xx.git] / arch / arm / mm / dma-mapping.c

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 0e28cf33f7dd96bc2f28d085e0c9494aa4afaae1..67960017dc8f1f79c40bd083205f3409cdf0fbd1 100644 (file)
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -585,12 +585,8 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
        int i;
 
        for_each_sg(sg, s, nents, i) {
-               if (!dmabounce_sync_for_cpu(dev, sg_dma_address(s), 0,
-                                       sg_dma_len(s), dir))
-                       continue;
-
-               if (!arch_is_coherent())
-                       dma_cache_maint(sg_virt(s), s->length, dir);
+               dmabounce_sync_for_cpu(dev, sg_dma_address(s), 0,
+                                       sg_dma_len(s), dir);
        }
 }
 EXPORT_SYMBOL(dma_sync_sg_for_cpu);