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

Commit c21f0cb4 authored by Antonio Ospite's avatar Antonio Ospite Committed by Mauro Carvalho Chehab
Browse files

[media] gspca: fix a v4l2-compliance failure about buffer timestamp 



v4l2-compliance fails with this message:

  fail: v4l2-test-buffers.cpp(250): \
      timestamp != V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC && \
      timestamp != V4L2_BUF_FLAG_TIMESTAMP_COPY
  ...
  test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: FAIL

When setting the frame time, gspca uses v4l2_get_timestamp() which uses
ktime_get_ts() which uses ktime_get_ts64() which returns a monotonic
timestamp, so it's safe to initialize the buffer flags to
V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC to fix the failure.

Signed-off-by: default avatarAntonio Ospite <ao2@ao2.it>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent b3f18ec6

drivers/media/usb/gspca/gspca.c

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ static int frame_alloc(struct gspca_dev *gspca_dev, struct file *file, 
		frame = &gspca_dev->frame[i];

		frame->v4l2_buf.index = i;

		frame->v4l2_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

		frame->v4l2_buf.flags = 0;

		frame->v4l2_buf.flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

		frame->v4l2_buf.field = V4L2_FIELD_NONE;

		frame->v4l2_buf.length = frsz;

		frame->v4l2_buf.memory = memory;