diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
| commit | c30e05a83632aeb144f9d3912d39162564244a34 (patch) | |
| tree | 9877e4ed4167591ccb709ffbee27d7766986dabb /linux/drivers/media/video/videobuf-dma-sg.c | |
| parent | ba8e7e903d8aaa290f8528c1beba1284c1d33ddf (diff) | |
| parent | e2b3b766697ca509f1281178161156ab8df5b0d5 (diff) | |
| download | mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.gz mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/oxford2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/videobuf-dma-sg.c')
| -rw-r--r-- | linux/drivers/media/video/videobuf-dma-sg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/videobuf-dma-sg.c b/linux/drivers/media/video/videobuf-dma-sg.c index e2a3f9031..c5f6d22ce 100644 --- a/linux/drivers/media/video/videobuf-dma-sg.c +++ b/linux/drivers/media/video/videobuf-dma-sg.c @@ -436,7 +436,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), vm_fault->virtual_address, page); + clear_user_page(page_address(page), (unsigned long)vmf->virtual_address, + page); vmf->page = page; return 0; } |