---

yaml --- r: 76541 b: refs/heads/master c: d172b8b h: refs/heads/master i: 76539: 083eab2 v: v3
git-mirror · Jan 25, 2008 · 78982e2 · 78982e2
1 parent 1b112cc
commit 78982e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 105354a0f0410d4715f38e67d5790dead5dafdad
+refs/heads/master: d172b8bdab3812a6ad710e4cc78ceea3e8a40cd5
diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/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;
 }