---

yaml --- r: 308034 b: refs/heads/master c: 47142f0 h: refs/heads/master v: v3
git-mirror · May 21, 2012 · e72705e · e72705e
1 parent 2aa094a
commit e72705e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);