aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/dma-mapping.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
-rw-r--r--arch/arm/mm/dma-mapping.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 6774b03aa405..d42557ee69c2 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -2405,9 +2405,7 @@ long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr,
2405pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot, 2405pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot,
2406 unsigned long attrs) 2406 unsigned long attrs)
2407{ 2407{
2408 if (!dev_is_dma_coherent(dev)) 2408 return __get_dma_pgprot(attrs, prot);
2409 return __get_dma_pgprot(attrs, prot);
2410 return prot;
2411} 2409}
2412 2410
2413void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, 2411void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,