From: Andrew Morton <akpm@linux-foundation.org>
Date: Sat, 8 Dec 2007 00:14:43 +0000 (-0300)
Subject: V4L/DVB (6749): v4l-nopage-fix
X-Git-Tag: v2.6.25-rc1~1235^2~241
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d172b8bdab3812a6ad710e4cc78ceea3e8a40cd5;p=linux-2.6

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>
---

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index eea5b4ecfc..98efd7ab1f 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;
 }