From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 2 Dec 2012 09:18:35 +0000 (-0300)
Subject: [media] media: davinci: vpbe: fix return value check in vpbe_display_reqbufs()
X-Git-Tag: upstream/snapshot3+hdmi~4891^2~554
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d22f1086d24f61e271e1e84c0c27db4ad495e8f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

[media] media: davinci: vpbe: fix return value check in vpbe_display_reqbufs()

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>
---

diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 3846890..0723c46 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -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));