[RFCv2 PATCH 24/34] vb2-core: add support for count == 0 in create_bufs.

[Hans Verkuil]

From: Hans Verkuil <hans.verk...@cisco.com>

This also fixes incorrect error handling in create_bufs: the return code
of __vb2_queue_alloc is the number of allocated buffers, and not a
traditional error code.

Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
---
 drivers/media/video/videobuf2-core.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/media/video/videobuf2-core.c 
b/drivers/media/video/videobuf2-core.c
index 8486e33..bfcacaa 100644
--- a/drivers/media/video/videobuf2-core.c
+++ b/drivers/media/video/videobuf2-core.c
@@ -667,9 +667,9 @@ static int __create_bufs(struct vb2_queue *q, struct 
v4l2_create_buffers *create
        /* Finally, allocate buffers and video memory */
        ret = __vb2_queue_alloc(q, create->memory, num_buffers,
                                num_planes);
-       if (ret < 0) {
-               dprintk(1, "Memory allocation failed with error: %d\n", ret);
-               return ret;
+       if (ret == 0) {
+               dprintk(1, "Memory allocation failed\n");
+               return -ENOMEM;
        }
 
        allocated_buffers = ret;
@@ -700,7 +700,7 @@ static int __create_bufs(struct vb2_queue *q, struct 
v4l2_create_buffers *create
 
        if (ret < 0) {
                __vb2_queue_free(q, allocated_buffers);
-               return ret;
+               return -ENOMEM;
        }
 
        /*
@@ -724,6 +724,8 @@ int vb2_create_bufs(struct vb2_queue *q, struct 
v4l2_create_buffers *create)
        int ret = __verify_memory_type(q, create->memory, create->format.type);
 
        create->index = q->num_buffers;
+       if (create->count == 0)
+               return ret != -EBUSY ? ret : 0;
        return ret ? ret : __create_bufs(q, create);
 }
 EXPORT_SYMBOL_GPL(vb2_create_bufs);
-- 
1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html