* [PATCH v3 3/4] uvcvideo: fix a wrong macro [not found] <1481541412-1186-1-git-send-email-guennadi.liakhovetski@intel.com> @ 2016-12-12 11:16 ` Guennadi Liakhovetski 2016-12-30 13:33 ` Laurent Pinchart 0 siblings, 1 reply; 3+ messages in thread From: Guennadi Liakhovetski @ 2016-12-12 11:16 UTC (permalink / raw) To: linux-media; +Cc: Laurent Pinchart, Hans Verkuil, Guennadi Liakhovetski, stable From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Don't mix up UVC_BUF_STATE_* and VB2_BUF_STATE_* codes. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com> Cc: stable@vger.kernel.org --- 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 c119551..b9ef31c 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c @@ -412,7 +412,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); -- 1.9.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 3/4] uvcvideo: fix a wrong macro 2016-12-12 11:16 ` [PATCH v3 3/4] uvcvideo: fix a wrong macro Guennadi Liakhovetski @ 2016-12-30 13:33 ` Laurent Pinchart 0 siblings, 0 replies; 3+ messages in thread From: Laurent Pinchart @ 2016-12-30 13:33 UTC (permalink / raw) To: Guennadi Liakhovetski Cc: linux-media, Hans Verkuil, Guennadi Liakhovetski, stable Hi Guennadi, Thank you for the patch. On Monday 12 Dec 2016 12:16:51 Guennadi Liakhovetski wrote: > From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > > Don't mix up UVC_BUF_STATE_* and VB2_BUF_STATE_* codes. > > Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com> > Cc: stable@vger.kernel.org Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> and applied to my tree for v4.11. > --- > 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 c119551..b9ef31c 100644 > --- a/drivers/media/usb/uvc/uvc_queue.c > +++ b/drivers/media/usb/uvc/uvc_queue.c > @@ -412,7 +412,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); -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <1481540973-32155-1-git-send-email-guennadi.liakhovetski@intel.com>]
* [PATCH v3 3/4] uvcvideo: fix a wrong macro [not found] <1481540973-32155-1-git-send-email-guennadi.liakhovetski@intel.com> @ 2016-12-12 11:09 ` Guennadi Liakhovetski 0 siblings, 0 replies; 3+ messages in thread From: Guennadi Liakhovetski @ 2016-12-12 11:09 UTC (permalink / raw) To: gvlyakh; +Cc: stable Don't mix up UVC_BUF_STATE_* and VB2_BUF_STATE_* codes. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com> Cc: stable@vger.kernel.org --- 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 c119551..b9ef31c 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c @@ -412,7 +412,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); -- 1.9.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-30 13:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1481541412-1186-1-git-send-email-guennadi.liakhovetski@intel.com>
2016-12-12 11:16 ` [PATCH v3 3/4] uvcvideo: fix a wrong macro Guennadi Liakhovetski
2016-12-30 13:33 ` Laurent Pinchart
[not found] <1481540973-32155-1-git-send-email-guennadi.liakhovetski@intel.com>
2016-12-12 11:09 ` Guennadi Liakhovetski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox