aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/tw68
diff options
context:
space:
mode:
authorJunghak Sung <jh1009.sung@samsung.com>2015-11-03 05:16:37 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-18 10:53:31 -0500
commitd6dd645eae76eeb42cb47d9da69cd3f56b3f2cb6 (patch)
tree7cd1f67b772a7829c832aca35a69454b162ab2d0 /drivers/media/pci/tw68
parent9057bc2b35cfdb5b5fb7d93708f11de5dd9b6b2e (diff)
[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/pci/tw68')
-rw-r--r--drivers/media/pci/tw68/tw68-video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c
index 2e71af15ddb0..07116a87a57b 100644
--- a/drivers/media/pci/tw68/tw68-video.c
+++ b/drivers/media/pci/tw68/tw68-video.c
@@ -1016,7 +1016,7 @@ void tw68_irq_video_done(struct tw68_dev *dev, unsigned long status)
1016 buf = list_entry(dev->active.next, struct tw68_buf, list); 1016 buf = list_entry(dev->active.next, struct tw68_buf, list);
1017 list_del(&buf->list); 1017 list_del(&buf->list);
1018 spin_unlock(&dev->slock); 1018 spin_unlock(&dev->slock);
1019 v4l2_get_timestamp(&buf->vb.timestamp); 1019 buf->vb.vb2_buf.timestamp = ktime_get_ns();
1020 buf->vb.field = dev->field; 1020 buf->vb.field = dev->field;
1021 buf->vb.sequence = dev->seqnr++; 1021 buf->vb.sequence = dev->seqnr++;
1022 vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE); 1022 vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);