From 78982e23d067b65f02e84e2f18002fa84826713f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 7 Dec 2007 21:14:43 -0300 Subject: [PATCH] --- yaml --- r: 76541 b: refs/heads/master c: d172b8bdab3812a6ad710e4cc78ceea3e8a40cd5 h: refs/heads/master i: 76539: 083eab23906ec8373ee9c14a1e22f4516a419a8d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-dma-sg.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ed1143dd1c64..6af905b4f7ff 100644 --- 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 index eea5b4ecfc3d..98efd7ab1f50 100644 --- 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; }