diff options
| author | Junghak Sung <jh1009.sung@samsung.com> | 2015-11-03 11:16:37 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-12-18 16:53:31 +0100 |
| commit | d6dd645eae76eeb42cb47d9da69cd3f56b3f2cb6 (patch) | |
| tree | 7cd1f67b772a7829c832aca35a69454b162ab2d0 /drivers/media/platform/s3c-camif | |
| parent | [media] solo6x10: use v4l2_get_timestamp to fill in buffer timestamp (diff) | |
| download | linux-d6dd645eae76eeb42cb47d9da69cd3f56b3f2cb6.tar.xz linux-d6dd645eae76eeb42cb47d9da69cd3f56b3f2cb6.zip | |
[media] media: videobuf2: Move timestamp to vb2_buffer
Move timestamp from struct vb2_v4l2_buffer to struct vb2_buffer
for common use, and change its type to u64 in order to handling
y2038 problem. This patch also includes all device drivers' changes related to
this restructuring.
Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/s3c-camif')
| -rw-r--r-- | drivers/media/platform/s3c-camif/camif-capture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c index 68e651295ded..ec3abbed87d9 100644 --- a/drivers/media/platform/s3c-camif/camif-capture.c +++ b/drivers/media/platform/s3c-camif/camif-capture.c @@ -338,7 +338,7 @@ irqreturn_t s3c_camif_irq_handler(int irq, void *priv) if (!WARN_ON(vbuf == NULL)) { /* Dequeue a filled buffer */ - v4l2_get_timestamp(&vbuf->vb.timestamp); + vbuf->vb.vb2_buf.timestamp = ktime_get_ns(); vbuf->vb.sequence = vp->frame_sequence++; vb2_buffer_done(&vbuf->vb.vb2_buf, VB2_BUF_STATE_DONE); |