uvcvideo: Fix a wrong macro
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Mon, 12 Dec 2016 11:16:51 +0000 (09:16 -0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 7 Jun 2017 22:47:01 +0000 (00:47 +0200)
commit 17c341ec0115837a610b2da15e32546e26068234 upstream.

Don't mix up UVC_BUF_STATE_* and VB2_BUF_STATE_* codes.

Fixes: 6998b6fb4b1c ("[media] uvcvideo: Use videobuf2-vmalloc")

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/media/usb/uvc/uvc_queue.c

index cd962be860ca3ac14d87dfca467cce021cfa8f4f..7e743958dbce1c243d28cf681c1b72bd648a0508 100644 (file)
@@ -375,7 +375,7 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
                nextbuf = NULL;
        spin_unlock_irqrestore(&queue->irqlock, flags);
 
-       buf->state = buf->error ? VB2_BUF_STATE_ERROR : UVC_BUF_STATE_DONE;
+       buf->state = buf->error ? UVC_BUF_STATE_ERROR : UVC_BUF_STATE_DONE;
        vb2_set_plane_payload(&buf->buf, 0, buf->bytesused);
        vb2_buffer_done(&buf->buf, VB2_BUF_STATE_DONE);