---

yaml --- r: 357071 b: refs/heads/master c: 4d22f10 h: refs/heads/master i: 357069: 8fe5cbd 357067: 68f1565 357063: 9a266a9 357055: 17be32e v: v3
git-mirror · Dec 21, 2012 · 636a2b1 · 636a2b1
1 parent 5be1fd2
commit 636a2b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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));