ENGR00229938 pxp/v4l2: check return value of kmalloc against NULL

This is needed sanity check, because on Ubuntu it's likely that low memory
will happen. This patch also makes this memory allocated from dma zone.

Signed-off-by: Robby Cai <R63905@freescale.com>

diff --git a/drivers/media/video/mxc/output/mxc_pxp_v4l2.c b/drivers/media/video/mxc/output/mxc_pxp_v4l2.c
index c17f9f1d9cdce757503140aa7fd5b3d5206567c8..08d16b9f75d348814ce8230b7c6dc21e91b2af49 100644 (file)
--- a/drivers/media/video/mxc/output/mxc_pxp_v4l2.c
+++ b/drivers/media/video/mxc/output/mxc_pxp_v4l2.c
@@ -396,7 +396,12 @@ static int pxp_s_output(struct file *file, void *fh,
                bpp = 2;
 
        pxp->outb_size = fmt->width * fmt->height * bpp;
-       pxp->outb = kmalloc(fmt->width * fmt->height * bpp, GFP_KERNEL);
+       pxp->outb = kmalloc(fmt->width * fmt->height * bpp,
+                               GFP_KERNEL | GFP_DMA);
+       if (pxp->outb == NULL) {
+               dev_err(&pxp->pdev->dev, "No enough memory!\n");
+               return -ENOMEM;
+       }
        pxp->outb_phys = virt_to_phys(pxp->outb);
        dma_map_single(NULL, pxp->outb,
                        fmt->width * fmt->height * bpp, DMA_TO_DEVICE);