diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2016-12-12 09:16:51 -0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-06-05 21:17:01 +0100 |
| commit | 8602693ae85ecaf5573b0d7a1a995d39bde215b7 (patch) | |
| tree | 9bc61b2acf391a122d5e995e3d7536dd0120e330 /drivers | |
| parent | c83c9e0ba829ef77d9dc2df730e16b2457d3bdf7 (diff) | |
| download | linux-stable-8602693ae85ecaf5573b0d7a1a995d39bde215b7.tar.gz linux-stable-8602693ae85ecaf5573b0d7a1a995d39bde215b7.tar.bz2 linux-stable-8602693ae85ecaf5573b0d7a1a995d39bde215b7.zip | |
uvcvideo: Fix a wrong macro
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>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
| -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 6e92d2080255..453094b28b41 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c @@ -390,7 +390,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); |