From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from lb1-smtp-cloud6.xs4all.net ([194.109.24.24]:39272 "EHLO lb1-smtp-cloud6.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161582AbbKTQkI (ORCPT ); Fri, 20 Nov 2015 11:40:08 -0500 From: Hans Verkuil To: linux-media@vger.kernel.org Cc: pawel@osciak.com, sakari.ailus@iki.fi, jh1009.sung@samsung.com, inki.dae@samsung.com, Hans Verkuil Subject: [PATCHv10 12/15] videobuf2-core: fill in q->bufs[vb->index] before buf_init() Date: Fri, 20 Nov 2015 17:34:15 +0100 Message-Id: <1448037258-36305-13-git-send-email-hverkuil@xs4all.nl> In-Reply-To: <1448037258-36305-1-git-send-email-hverkuil@xs4all.nl> References: <1448037258-36305-1-git-send-email-hverkuil@xs4all.nl> Sender: linux-media-owner@vger.kernel.org List-ID: From: Hans Verkuil Fill in q->bufs[vb->index] before the call to buf_init: it makes sense that this is initialized correctly. Signed-off-by: Hans Verkuil --- drivers/media/v4l2-core/videobuf2-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 96dca47..98b5449 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -352,6 +352,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum vb2_memory memory, vb->memory = memory; for (plane = 0; plane < num_planes; ++plane) vb->planes[plane].length = q->plane_sizes[plane]; + q->bufs[vb->index] = vb; /* Allocate video buffer memory for the MMAP type */ if (memory == VB2_MEMORY_MMAP) { @@ -360,6 +361,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum vb2_memory memory, dprintk(1, "failed allocating memory for " "buffer %d\n", buffer); kfree(vb); + q->bufs[vb->index] = NULL; break; } /* @@ -372,12 +374,11 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum vb2_memory memory, dprintk(1, "buffer %d %p initialization" " failed\n", buffer, vb); __vb2_buf_mem_free(vb); + q->bufs[vb->index] = NULL; kfree(vb); break; } } - - q->bufs[q->num_buffers + buffer] = vb; } if (memory == VB2_MEMORY_MMAP) -- 2.6.2