projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bca0fa5
)
ARM: dma-mapping: use dma_mmap_from_coherent()
author
Marek Szyprowski
<m.szyprowski@samsung.com>
Tue, 15 May 2012 17:04:13 +0000
(19:04 +0200)
committer
Marek Szyprowski
<m.szyprowski@samsung.com>
Mon, 21 May 2012 13:06:10 +0000
(15:06 +0200)
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
arch/arm/mm/dma-mapping.c
patch
|
blob
|
history
diff --git
a/arch/arm/mm/dma-mapping.c
b/arch/arm/mm/dma-mapping.c
index db23ae4aaaaba3384d000181e4dfb1c9ac476e60..7ec08636fda524ed8233c69ba47c0ddd767ff6f5 100644
(file)
--- a/
arch/arm/mm/dma-mapping.c
+++ b/
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);