mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
[media] videobuf2-core: fill in q->bufs[vb->index] before buf_init()
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 <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
489648afcd
commit
e32f856ab2
1 changed files with 3 additions and 2 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue