diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-04-10 08:07:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 20:03:24 -0300 |
| commit | 0dcb953a6eeae84566fe288d507aed49ead4cc6e (patch) | |
| tree | df954a910dd4a68393770468e791f39cedad80c4 /drivers/staging/media | |
| parent | 228b791bfd52f437fd9a04fe9432dfec9c0d0333 (diff) | |
| download | lwn-0dcb953a6eeae84566fe288d507aed49ead4cc6e.tar.gz lwn-0dcb953a6eeae84566fe288d507aed49ead4cc6e.zip | |
[media] dt3155v4l: fix timestamp handling
Use the monotonic clock and set the timestamp_type that vb2 expects.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/dt3155v4l/dt3155v4l.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c index 57fadead0643..c32e0acde4f4 100644 --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c @@ -26,6 +26,7 @@ #include <linux/slab.h> #include <media/v4l2-dev.h> #include <media/v4l2-ioctl.h> +#include <media/v4l2-common.h> #include <media/videobuf2-dma-contig.h> #include "dt3155v4l.h" @@ -341,7 +342,7 @@ dt3155_irq_handler_even(int irq, void *dev_id) spin_lock(&ipd->lock); if (ipd->curr_buf) { - do_gettimeofday(&ipd->curr_buf->v4l2_buf.timestamp); + v4l2_get_timestamp(&ipd->curr_buf->v4l2_buf.timestamp); ipd->curr_buf->v4l2_buf.sequence = (ipd->field_count) >> 1; vb2_buffer_done(ipd->curr_buf, VB2_BUF_STATE_DONE); } @@ -390,6 +391,7 @@ dt3155_open(struct file *filp) goto err_alloc_queue; } pd->q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + pd->q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; pd->q->io_modes = VB2_READ | VB2_MMAP; pd->q->ops = &q_ops; pd->q->mem_ops = &vb2_dma_contig_memops; |