From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from www.linuxtv.org ([130.149.80.248]:47142 "EHLO www.linuxtv.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752182AbdAaM5e (ORCPT ); Tue, 31 Jan 2017 07:57:34 -0500 From: Mauro Carvalho Chehab Date: Tue, 31 Jan 2017 12:55:41 +0000 Subject: [git:media_tree/master] [media] uvcvideo: Fix a wrong macro To: linuxtv-commits@linuxtv.org Cc: stable@vger.kernel.org, Guennadi Liakhovetski , Laurent Pinchart Reply-to: linux-media@vger.kernel.org Message-Id: Sender: stable-owner@vger.kernel.org List-ID: This is an automatic generated email to let you know that the following patch were queued: Subject: [media] uvcvideo: Fix a wrong macro Author: Guennadi Liakhovetski Date: Mon Dec 12 09:16:51 2016 -0200 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 Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab drivers/media/usb/uvc/uvc_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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);