upstream: [media] vb2: fix PREPARE_BUF regression

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 <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 870cc45..e4bce18 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -1442,11 +1442,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:
@@ -1460,7 +1455,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;
        }