diff options
author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2013-03-09 04:53:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-18 19:16:47 -0400 |
commit | 195281d0dc6a2fc1824d5da9abd2924bce0fa698 (patch) | |
tree | a196808e139c86dfda105f7a8e17f47c6ad30fa4 | |
parent | aab3125c43d8fecc7134e5f1e729fabf4dd196da (diff) |
[media] em28xx: set the timestamp type for video and vbi vb2_queues
The em28xx driver obtains the timestamps using function v4l2_get_timestamp(),
which produces a montonic timestamp.
Fixes the warnings appearing in the system log since commit 6aa69f99
"[media] vb2: Add support for non monotonic timestamps"
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 93fc6204df6c..d585c19a5d9c 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c | |||
@@ -700,6 +700,7 @@ int em28xx_vb2_setup(struct em28xx *dev) | |||
700 | q = &dev->vb_vidq; | 700 | q = &dev->vb_vidq; |
701 | q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | 701 | q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; |
702 | q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF; | 702 | q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF; |
703 | q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; | ||
703 | q->drv_priv = dev; | 704 | q->drv_priv = dev; |
704 | q->buf_struct_size = sizeof(struct em28xx_buffer); | 705 | q->buf_struct_size = sizeof(struct em28xx_buffer); |
705 | q->ops = &em28xx_video_qops; | 706 | q->ops = &em28xx_video_qops; |
@@ -713,6 +714,7 @@ int em28xx_vb2_setup(struct em28xx *dev) | |||
713 | q = &dev->vb_vbiq; | 714 | q = &dev->vb_vbiq; |
714 | q->type = V4L2_BUF_TYPE_VBI_CAPTURE; | 715 | q->type = V4L2_BUF_TYPE_VBI_CAPTURE; |
715 | q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR; | 716 | q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR; |
717 | q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; | ||
716 | q->drv_priv = dev; | 718 | q->drv_priv = dev; |
717 | q->buf_struct_size = sizeof(struct em28xx_buffer); | 719 | q->buf_struct_size = sizeof(struct em28xx_buffer); |
718 | q->ops = &em28xx_vbi_qops; | 720 | q->ops = &em28xx_vbi_qops; |