diff options
| author | Guennadi Liakhovetski | 2016-12-12 12:16:51 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2017-01-31 13:55:41 +0100 |
| commit | 17c341ec0115837a610b2da15e32546e26068234 (patch) | |
| tree | 5b60b36bd4b144374321b7f2dd669144993053f4 /drivers/media/usb/uvc | |
| parent | [media] uvcvideo: (cosmetic) Remove a superfluous assignment (diff) | |
| download | kernel-qcow2-linux-17c341ec0115837a610b2da15e32546e26068234.tar.gz kernel-qcow2-linux-17c341ec0115837a610b2da15e32546e26068234.tar.xz kernel-qcow2-linux-17c341ec0115837a610b2da15e32546e26068234.zip | |
[media] uvcvideo: Fix a wrong macro
Don't mix up UVC_BUF_STATE_* and VB2_BUF_STATE_* codes.
Fixes: 6998b6fb4b1c ("[media] uvcvideo: Use videobuf2-vmalloc")
Cc: stable@vger.kernel.org
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>
Diffstat (limited to 'drivers/media/usb/uvc')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c index 0cc7ae23604d..aa2199775cb8 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c @@ -417,7 +417,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.vb2_buf, 0, buf->bytesused); vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_DONE); |