[media] media: davinci: vpbe: fix return value check in vpbe_display_reqbufs()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Sun, 2 Dec 2012 09:18:35 +0000 (06:18 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 21 Dec 2012 16:21:46 +0000 (14:21 -0200)
In case of error, the function vb2_dma_contig_init_ctx() returns
ERR_PTR() and never returns NULL. The NULL test in the return value
check should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Prabhakar Lad <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/davinci/vpbe_display.c

index 3846890ea707e58a5dfdf8bc10d8d71c4f2fc037..0723c4694cedc103d5c1bfb6ff5f0ce8ea86e2cf 100644 (file)
@@ -1393,9 +1393,9 @@ static int vpbe_display_reqbufs(struct file *file, void *priv,
        }
        /* Initialize videobuf queue as per the buffer type */
        layer->alloc_ctx = vb2_dma_contig_init_ctx(vpbe_dev->pdev);
-       if (!layer->alloc_ctx) {
+       if (IS_ERR(layer->alloc_ctx)) {
                v4l2_err(&vpbe_dev->v4l2_dev, "Failed to get the context\n");
-               return -EINVAL;
+               return PTR_ERR(layer->alloc_ctx);
        }
        q = &layer->buffer_queue;
        memset(q, 0, sizeof(*q));