diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-05-15 19:04:13 +0200 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-05-21 15:06:10 +0200 |
commit | 47142f07eea32e9c108f548a4b06c28bec7df6e4 (patch) | |
tree | b170dc8d992de4d968331f84bb67f34476477c72 /arch/arm/mm | |
parent | bca0fa5f12a6744a2b2e53154af65a51402b3426 (diff) | |
download | op-kernel-dev-47142f07eea32e9c108f548a4b06c28bec7df6e4.zip op-kernel-dev-47142f07eea32e9c108f548a4b06c28bec7df6e4.tar.gz |
ARM: dma-mapping: use dma_mmap_from_coherent()
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/dma-mapping.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index db23ae4..7ec0863 100644 --- 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); |