summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-12-08 01:14:43 +0100
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 22:03:20 +0100
commitd172b8bdab3812a6ad710e4cc78ceea3e8a40cd5 (patch)
tree1ae4518bdfb7472f2c4a35b6384328cd00b0c063 /drivers/media
parentV4L/DVB (6748): Subject: v4l: nopage (diff)
downloadlinux-d172b8bdab3812a6ad710e4cc78ceea3e8a40cd5.tar.xz
linux-d172b8bdab3812a6ad710e4cc78ceea3e8a40cd5.zip
V4L/DVB (6749): v4l-nopage-fix
dont just copy-and-paste stuff. (compile-tested this time) Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/videobuf-dma-sg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index eea5b4ecfc3d..98efd7ab1f50 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -395,7 +395,8 @@ videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
page = alloc_page(GFP_USER | __GFP_DMA32);
if (!page)
return VM_FAULT_OOM;
- clear_user_page(page_address(page), vaddr, page);
+ clear_user_page(page_address(page), (unsigned long)vmf->virtual_address,
+ page);
vmf->page = page;
return 0;
}