diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:58:18 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:58:18 -0200 |
| commit | cdd8a614f8de70d50a815bad283ceab2bfe9a625 (patch) | |
| tree | 11d4ddf2b97457c2127c86c120fa5685c8194274 | |
| parent | accc1779158f99f09dae8f4a0d648a3ca1c4b614 (diff) | |
| download | mediapointer-dvb-s2-cdd8a614f8de70d50a815bad283ceab2bfe9a625.tar.gz mediapointer-dvb-s2-cdd8a614f8de70d50a815bad283ceab2bfe9a625.tar.bz2 | |
backport: V4L/DVB (6749): v4l-nopage-fix
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Original patch from: Andrew Morton <akpm@linux-foundation.org>
dont just copy-and-paste stuff.
(compile-tested this time)
(Andrew submitted an updated version after I've applied it on -hg - The newer
patch were replaced at -git)
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -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; } |