From 636a2b1bfe37865fd954ccdd048469e086a742ac Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 2 Dec 2012 06:18:35 -0300
Subject: [PATCH] --- yaml --- r: 357071 b: refs/heads/master c:
 4d22f1086d24f61e271e1e84c0c27db4ad495e8f h: refs/heads/master i:   357069:
 8fe5cbdec0a404a8757ddcb533800f4f22bf2dbc   357067:
 68f1565aa4c7403f2e3a622ed163c15a2f5a9fa8   357063:
 9a266a98a4a00c73bebcad94e44a275251ed0b52   357055:
 17be32e9db6dcf3d025375339cb94f95f1f2279f v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/platform/davinci/vpbe_display.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 47a1bd80649d..3e18fda5a810 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfe9dbd8a76835abd33ba92060817e2699524b1e
+refs/heads/master: 4d22f1086d24f61e271e1e84c0c27db4ad495e8f
diff --git a/trunk/drivers/media/platform/davinci/vpbe_display.c b/trunk/drivers/media/platform/davinci/vpbe_display.c
index 3846890ea707..0723c4694ced 100644
--- a/trunk/drivers/media/platform/davinci/vpbe_display.c
+++ b/trunk/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));