From e72705ee91ad7cc2b1eadc8d7771d69ecafb26bc Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Tue, 15 May 2012 19:04:13 +0200
Subject: [PATCH] --- yaml --- r: 308034 b: refs/heads/master c:
 47142f07eea32e9c108f548a4b06c28bec7df6e4 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mm/dma-mapping.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3f14e43b5bf3..8c40115f94c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bca0fa5f12a6744a2b2e53154af65a51402b3426
+refs/heads/master: 47142f07eea32e9c108f548a4b06c28bec7df6e4
diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c
index db23ae4aaaab..7ec08636fda5 100644
--- a/trunk/arch/arm/mm/dma-mapping.c
+++ b/trunk/arch/arm/mm/dma-mapping.c
@@ -401,6 +401,9 @@ static int dma_mmap(struct device *dev, struct vm_area_struct *vma,
 	unsigned long user_size, kern_size;
 	struct arm_vmregion *c;
 
+	if (dma_mmap_from_coherent(dev, vma, cpu_addr, size, &ret))
+		return ret;
+
 	user_size = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 
 	c = arm_vmregion_find(&consistent_head, (unsigned long)cpu_addr);