diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2007-12-07 19:14:43 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:03:20 -0500 |
commit | d172b8bdab3812a6ad710e4cc78ceea3e8a40cd5 (patch) | |
tree | 1ae4518bdfb7472f2c4a35b6384328cd00b0c063 /drivers/media/video/videobuf-dma-sg.c | |
parent | 105354a0f0410d4715f38e67d5790dead5dafdad (diff) |
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/video/videobuf-dma-sg.c')
-rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 3 |
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) | |||
395 | page = alloc_page(GFP_USER | __GFP_DMA32); | 395 | page = alloc_page(GFP_USER | __GFP_DMA32); |
396 | if (!page) | 396 | if (!page) |
397 | return VM_FAULT_OOM; | 397 | return VM_FAULT_OOM; |
398 | clear_user_page(page_address(page), vaddr, page); | 398 | clear_user_page(page_address(page), (unsigned long)vmf->virtual_address, |
399 | page); | ||
399 | vmf->page = page; | 400 | vmf->page = page; |
400 | return 0; | 401 | return 0; |
401 | } | 402 | } |