From 5b4d4483aa035000d6ca2dcfe5b0c6afe90fb9ae Mon Sep 17 00:00:00 2001 From: Ma Haijun Date: Thu, 27 Mar 2014 08:07:06 -0300 Subject: [PATCH] upstream: [media] videobuf-dma-contig: fix incorrect argument to vm_iomap_memory() call The second argument should be physical address rather than virtual address. Signed-off-by: Ma Haijun Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/videobuf-dma-contig.c b/drivers/media/v4l2-core/videobuf-dma-contig.c index 7e6b209..bf80f0f 100644 --- a/drivers/media/v4l2-core/videobuf-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf-dma-contig.c @@ -305,7 +305,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, /* Try to remap memory */ size = vma->vm_end - vma->vm_start; vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); - retval = vm_iomap_memory(vma, vma->vm_start, size); + retval = vm_iomap_memory(vma, mem->dma_handle, size); if (retval) { dev_err(q->dev, "mmap: remap failed with error %d. ", retval); -- 2.7.4