[media] V4L2: omap_vout: Remove GFP_DMA allocation as ZONE_DMA is not configured...
authorAmber Jain <amber@ti.com>
Tue, 31 May 2011 14:45:35 +0000 (11:45 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:56:05 +0000 (17:56 -0300)
Remove GFP_DMA from the __get_free_pages() call from omap_vout 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 a197b59ae6e8bee56fcef37ea2482dc08414e2ac, page allocator
returns null in such a scenario with a warning emitted to kernel log.

Signed-off-by: Amber Jain <amber@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/omap/omap_vout.c

index a647894d3a717a9307be0a0b1ad243012f7d25bf..cb70ff139d8fdc8ae318271089f33ea37182720e 100644 (file)
@@ -181,7 +181,7 @@ static unsigned long omap_vout_alloc_buffer(u32 buf_size, u32 *phys_addr)
 
        size = PAGE_ALIGN(buf_size);
        order = get_order(size);
-       virt_addr = __get_free_pages(GFP_KERNEL | GFP_DMA, order);
+       virt_addr = __get_free_pages(GFP_KERNEL, order);
        addr = virt_addr;
 
        if (virt_addr) {