-When the func vb2_core_reqbufs is called first time after
vb2_core_queue_init, the condition q->memory != memory
always gets satisfied since q->memory = 0 in
vb2_core_queue_init.
-After the condition is true,
unnecessary calls to __vb2_queue_cancel and
__vb2_queue_free are done
-In such case, *count is non-zero, q->num_buffers is zero
and q->memory is 0 which is not equal to memory field
*count=N, q->num_buffers=0, q->memory != memory
Signed-off-by: Satendra Singh Thakur <satendra.t@xxxxxxxxxxx>
---
drivers/media/v4l2-core/videobuf2-core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index a8589d9..b1140d5 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -662,7 +662,8 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory,
return -EBUSY;
}
- if (*count == 0 || q->num_buffers != 0 || q->memory != memory) {
+ if (*count == 0 || q->num_buffers != 0 ||
+ (q->memory && q->memory != memory)) {
/*
* We already have buffers allocated, so first check if they
* are not in use and can be freed.
--
2.7.4
