From: Robby Cai Date: Tue, 17 Aug 2010 09:44:22 +0000 (+0800) Subject: ENGR00126349-2 Change gfp flag in dma_alloc_coherent in common codes X-Git-Tag: v3.0.35-fsl~2485 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3d677e532e63a76cff1a8c86254950686c62e08b;p=karo-tx-linux.git ENGR00126349-2 Change gfp flag in dma_alloc_coherent in common codes Changed gfp flag directly in dma_alloc_coherent in drivers/media/video/videobuf-dma-contig.c Signed-off-by: Robby Cai (cherry picked from commit b5cfb266e2e2d40568d060b0426e6c4239a34a78) --- diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index 669f4ae8fa97..c47195b5b45a 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c @@ -284,7 +284,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, mem->size = PAGE_ALIGN(buf->bsize); mem->vaddr = dma_alloc_coherent(q->dev, mem->size, - &mem->dma_handle, GFP_KERNEL); + &mem->dma_handle, GFP_DMA); if (!mem->vaddr) { dev_err(q->dev, "dma_alloc_coherent size %ld failed\n", mem->size);