drivers: dma-coherent: Fix DMA coherent size for less than page

[cascardo/linux.git] / drivers / base / dma-coherent.c

diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
index bdf28f7..2789f7a 100644 (file)
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
@@ -261,8 +261,8 @@ int dma_mmap_from_coherent(struct device *dev, struct vm_area_struct *vma,
                   (mem->virt_base + (mem->size << PAGE_SHIFT))) {
                unsigned long off = vma->vm_pgoff;
                int start = (vaddr - mem->virt_base) >> PAGE_SHIFT;
-               int user_count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-               int count = size >> PAGE_SHIFT;
+               int user_count = vma_pages(vma);
+               int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
 
                *ret = -ENXIO;
                if (off < count && user_count <= count - off) {