]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00180103-2 V4L2: remove GFP_DMA flag when alloc dma memory
authorWayne Zou <b36644@freescale.com>
Sat, 28 Apr 2012 09:18:19 +0000 (17:18 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 24 May 2013 06:34:32 +0000 (08:34 +0200)
Remove GFP_DMA flag when alloc dma memory.

Signed-off-by: Wayne Zou <b36644@freescale.com>
drivers/media/video/mxc/output/mxc_vout.c

index 5f1deeeff76b2d83acab1abeaccc0ab7ae6433de..9d9be79dbb99e1500cb324602d3cc21bd9f65820 100644 (file)
@@ -965,9 +965,12 @@ static inline int vdoaipu_try_task(struct mxc_vout_output *vout)
                vout->vdoa_dma.vaddr = dma_alloc_coherent(vout->vbq.dev,
                                                        vout->vdoa_dma.size,
                                                        &vout->vdoa_dma.paddr,
-                                                       GFP_DMA | GFP_KERNEL);
-               if (!vout->vdoa_dma.vaddr)
+                                                       GFP_KERNEL);
+               if (!vout->vdoa_dma.vaddr) {
+                       v4l2_err(vout->vfd->v4l2_dev,
+                               "cannot get vdoa dma buf size:0x%x\n", size);
                        return -ENOMEM;
+               }
                v4l2_dbg(1, debug, vout->vfd->v4l2_dev,
                                "alloc vdoa_dma.size:0x%x, paddr:0x%x\n",
                                vout->vdoa_dma.size,