summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Zou <b36644@freescale.com>2012-04-28 17:18:19 +0800
committerFrank Li <Frank.Li@freescale.com>2012-04-30 16:15:51 +0800
commitf264d2369a32040e6b72245bdf9caf24ac3e0429 (patch)
tree3d9fe3e66acc704ad1f6d8b3ea5ca4c771c7c25b
parentf6168023b7731c7d0bd929b7d2b41d105112d4b7 (diff)
ENGR00180103-2 V4L2: remove GFP_DMA flag when alloc dma memory
Remove GFP_DMA flag when alloc dma memory. Signed-off-by: Wayne Zou <b36644@freescale.com>
-rw-r--r--drivers/media/video/mxc/output/mxc_vout.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/output/mxc_vout.c b/drivers/media/video/mxc/output/mxc_vout.c
index 5f1deeeff76b..9d9be79dbb99 100644
--- a/drivers/media/video/mxc/output/mxc_vout.c
+++ b/drivers/media/video/mxc/output/mxc_vout.c
@@ -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,