Commit 896f38f5 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab

[media] videobuf2-core: Replace BUG_ON and return an error at vb2_queue_init()

This replaces BUG_ON() calls with WARN_ON(), and returns
EINVAL if some parameter is NULL, as suggested by Jonathan and Mauro.
The BUG_ON() call is too drastic to be used in this case.
See the full discussion here:
http://www.spinics.net/lists/linux-media/msg52462.htmlSigned-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4195ec7a
...@@ -1738,14 +1738,17 @@ EXPORT_SYMBOL_GPL(vb2_poll); ...@@ -1738,14 +1738,17 @@ EXPORT_SYMBOL_GPL(vb2_poll);
*/ */
int vb2_queue_init(struct vb2_queue *q) int vb2_queue_init(struct vb2_queue *q)
{ {
BUG_ON(!q); /*
BUG_ON(!q->ops); * Sanity check
BUG_ON(!q->mem_ops); */
BUG_ON(!q->type); if (WARN_ON(!q) ||
BUG_ON(!q->io_modes); WARN_ON(!q->ops) ||
WARN_ON(!q->mem_ops) ||
BUG_ON(!q->ops->queue_setup); WARN_ON(!q->type) ||
BUG_ON(!q->ops->buf_queue); WARN_ON(!q->io_modes) ||
WARN_ON(!q->ops->queue_setup) ||
WARN_ON(!q->ops->buf_queue))
return -EINVAL;
INIT_LIST_HEAD(&q->queued_list); INIT_LIST_HEAD(&q->queued_list);
INIT_LIST_HEAD(&q->done_list); INIT_LIST_HEAD(&q->done_list);
......
...@@ -324,7 +324,7 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req); ...@@ -324,7 +324,7 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req);
int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create); int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create);
int vb2_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b); int vb2_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b);
int vb2_queue_init(struct vb2_queue *q); int __must_check vb2_queue_init(struct vb2_queue *q);
void vb2_queue_release(struct vb2_queue *q); void vb2_queue_release(struct vb2_queue *q);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment