From 8429871592efeddf0cd90d06f2dc0ee564a1f0fa Mon Sep 17 00:00:00 2001 From: "Lad, Prabhakar" Date: Wed, 3 Oct 2012 10:01:07 -0300 Subject: [PATCH] --- yaml --- r: 333785 b: refs/heads/master c: b4a711e7bf59e556d5f692e0c65ef12c6dad6cf8 h: refs/heads/master i: 333783: 32581b13477f8d656f25abb55aef946052a5778f v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/davinci/vpif_capture.c | 9 +++++++-- trunk/drivers/media/platform/davinci/vpif_display.c | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 802a81ceaae7..5157c75a51b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bd4e58c9d00325b7a850b2ac73fd902e9148b77 +refs/heads/master: b4a711e7bf59e556d5f692e0c65ef12c6dad6cf8 diff --git a/trunk/drivers/media/platform/davinci/vpif_capture.c b/trunk/drivers/media/platform/davinci/vpif_capture.c index 83b80baf868a..cabd5a2c3718 100644 --- a/trunk/drivers/media/platform/davinci/vpif_capture.c +++ b/trunk/drivers/media/platform/davinci/vpif_capture.c @@ -976,6 +976,7 @@ static int vpif_reqbufs(struct file *file, void *priv, struct common_obj *common; u8 index = 0; struct vb2_queue *q; + int ret; vpif_dbg(2, debug, "vpif_reqbufs\n"); @@ -1015,8 +1016,12 @@ static int vpif_reqbufs(struct file *file, void *priv, q->mem_ops = &vb2_dma_contig_memops; q->buf_struct_size = sizeof(struct vpif_cap_buffer); - vb2_queue_init(q); - + ret = vb2_queue_init(q); + if (ret) { + vpif_err("vpif_capture: vb2_queue_init() failed\n"); + vb2_dma_contig_cleanup_ctx(common->alloc_ctx); + return ret; + } /* Set io allowed member of file handle to TRUE */ fh->io_allowed[index] = 1; /* Increment io usrs member of channel object to 1 */ diff --git a/trunk/drivers/media/platform/davinci/vpif_display.c b/trunk/drivers/media/platform/davinci/vpif_display.c index ae8329d79242..7f20ca53b6f2 100644 --- a/trunk/drivers/media/platform/davinci/vpif_display.c +++ b/trunk/drivers/media/platform/davinci/vpif_display.c @@ -936,6 +936,7 @@ static int vpif_reqbufs(struct file *file, void *priv, enum v4l2_field field; struct vb2_queue *q; u8 index = 0; + int ret; /* This file handle has not initialized the channel, It is not allowed to do settings */ @@ -981,8 +982,12 @@ static int vpif_reqbufs(struct file *file, void *priv, q->mem_ops = &vb2_dma_contig_memops; q->buf_struct_size = sizeof(struct vpif_disp_buffer); - vb2_queue_init(q); - + ret = vb2_queue_init(q); + if (ret) { + vpif_err("vpif_display: vb2_queue_init() failed\n"); + vb2_dma_contig_cleanup_ctx(common->alloc_ctx); + return ret; + } /* Set io allowed member of file handle to TRUE */ fh->io_allowed[index] = 1; /* Increment io usrs member of channel object to 1 */