Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10329b96 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5069): Fix bttv and friends on 64bit machines with lots of memory 



We have a DMA32 zone now, lets use it to make sure the card
can reach the memory we have allocated for the video frame
buffers.

Signed-off-by: default avatarGerds Hoffmann <kraxel@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e382f62b

drivers/media/video/video-buf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1229,7 +1229,7 @@ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr, 
		vaddr,vma->vm_start,vma->vm_end);

		vaddr,vma->vm_start,vma->vm_end);

	if (vaddr > vma->vm_end)

	if (vaddr > vma->vm_end)

		return NOPAGE_SIGBUS;

		return NOPAGE_SIGBUS;

	page = alloc_page(GFP_USER);

	page = alloc_page(GFP_USER | __GFP_DMA32);

	if (!page)

	if (!page)

		return NOPAGE_OOM;

		return NOPAGE_OOM;

	clear_user_page(page_address(page), vaddr, page);

	clear_user_page(page_address(page), vaddr, page);