diff options
| author | Amber Jain <amber@ti.com> | 2011-05-31 11:45:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 17:56:05 -0300 |
| commit | e831599cb8bed4e6aa2a336ec2e3aaf74dee6353 (patch) | |
| tree | f6486a548aa1eaff8e06ff803b305b9ca6e33ed6 /drivers/media | |
| parent | 949d9264589b759df66d40d497d14ecc49681b3a (diff) | |
| download | op-kernel-dev-e831599cb8bed4e6aa2a336ec2e3aaf74dee6353.zip op-kernel-dev-e831599cb8bed4e6aa2a336ec2e3aaf74dee6353.tar.gz | |
[media] V4L2: omap_vout: Remove GFP_DMA allocation as ZONE_DMA is not configured on OMAP
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/omap/omap_vout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index a647894..cb70ff1 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -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) { |
