Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9e44b53 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Felipe Balbi
Browse files

usb: gadget: uvc: Set the vb2 queue timestamp flags 



The vb2 queue timestamp_flags field must be set by drivers, as enforced
by a WARN_ON in vb2_queue_init. The UVC gadget driver failed to do so.
This resulted in the following warning.

[    2.104371] g_webcam gadget: uvc_function_bind
[    2.105567] ------------[ cut here ]------------
[    2.105567] ------------[ cut here ]------------
[    2.106779] WARNING: CPU: 0 PID: 1 at drivers/media/v4l2-core/videobuf2-core.c:2207 vb2_queue_init+0xa3/0x113()

Fix it.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent f17388cc

drivers/usb/gadget/uvc_queue.c

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ static int uvc_queue_init(struct uvc_video_queue *queue, 
	queue->queue.buf_struct_size = sizeof(struct uvc_buffer);

	queue->queue.ops = &uvc_queue_qops;

	queue->queue.mem_ops = &vb2_vmalloc_memops;

	queue->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC

				     | V4L2_BUF_FLAG_TSTAMP_SRC_EOF;

	ret = vb2_queue_init(&queue->queue);

	if (ret)

		return ret;