Commit e213e438 authored May 31, 2011 by Amber Jain Committed by Mauro Carvalho Chehab Jul 27, 2011

[media] OMAP2: V4L2: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP



Remove GFP_DMA from the __get_free_pages() call from omap24xxcam as ZONE_DMA
is not configured on OMAP. Earlier the page allocator used to return a page
from ZONE_NORMAL even when GFP_DMA is passed and CONFIG_ZONE_DMA is disabled.
As a result of commit a197b59a, page allocator
returns null in such a scenario with a warning emitted to kernel log.

Signed-off-by: Amber Jain <amber@ti.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent e831599c

drivers/media/video/omap24xxcam.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -308,11 +308,11 @@ static int omap24xxcam_vbq_alloc_mmap_buffer(struct videobuf_buffer *vb)
		order--;

		/* try to allocate as many contiguous pages as possible */
		page = alloc_pages(GFP_KERNEL \| GFP_DMA, order);
		page = alloc_pages(GFP_KERNEL, order);
		/* if allocation fails, try to allocate smaller amount */
		while (page == NULL) {
		order--;
		page = alloc_pages(GFP_KERNEL \| GFP_DMA, order);
		page = alloc_pages(GFP_KERNEL, order);
		if (page == NULL && !order) {
		err = -ENOMEM;
		goto out;