On Sat, Mar 1, 2014 at 2:42 AM, Hans Verkuil wrote:
> Fix an incorrect test in vb2_internal_qbuf() where only DEQUEUED buffers
> are allowed. But PREPARED buffers are also OK.
>
> Introduced by commit 4138111a27859dcc56a5592c804dd16bb12a23d1
> ("vb2: simplify qbuf/prepare_buf by removing callback").
>
> Signed-off-by: Hans Verkuil
> Acked-by: Laurent Pinchart
Acked-by: Pawel Osciak
> ---
> drivers/media/v4l2-core/videobuf2-core.c | 8 ++--
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-core.c
> b/drivers/media/v4l2-core/videobuf2-core.c
> index f1a2857c..909f367 100644
> --- a/drivers/media/v4l2-core/videobuf2-core.c
> +++ b/drivers/media/v4l2-core/videobuf2-core.c
> @@ -1420,11 +1420,6 @@ static int vb2_internal_qbuf(struct vb2_queue *q,
> struct v4l2_buffer *b)
> return ret;
>
> vb = q->bufs[b->index];
> - if (vb->state != VB2_BUF_STATE_DEQUEUED) {
> - dprintk(1, "%s(): invalid buffer state %d\n", __func__,
> - vb->state);
> - return -EINVAL;
> - }
>
> switch (vb->state) {
> case VB2_BUF_STATE_DEQUEUED:
> @@ -1438,7 +1433,8 @@ static int vb2_internal_qbuf(struct vb2_queue *q,
> struct v4l2_buffer *b)
> dprintk(1, "qbuf: buffer still being prepared\n");
> return -EINVAL;
> default:
> - dprintk(1, "qbuf: buffer already in use\n");
> + dprintk(1, "%s(): invalid buffer state %d\n", __func__,
> + vb->state);
> return -EINVAL;
> }
>
> --
> 1.9.rc1
>
--
Best regards,
Pawel Osciak
--
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
