summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-11-20 07:16:56 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-18 13:49:47 -0200
commit9057bc2b35cfdb5b5fb7d93708f11de5dd9b6b2e (patch)
tree554ff360f4e7bb863c2f4872a20ddd994abfdb67 /drivers/media
parent02a34b6ace4cce92d5cf4d76e54afe0c71e4f706 (diff)
downloadlinux-9057bc2b35cfdb5b5fb7d93708f11de5dd9b6b2e.tar.bz2
[media] solo6x10: use v4l2_get_timestamp to fill in buffer timestamp
The timestamp of a v4l2_buffer was advertised as being CLOCK_MONOTONIC, but instead a timestamp from a header field was used. This is inconsistent and not what applications expect. Use v4l2_get_timestamp to properly set the timestamp. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 1f81f8d3649e..5b7853b75d2a 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -531,8 +531,7 @@ static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
if (!ret) {
vbuf->sequence = solo_enc->sequence++;
- vbuf->timestamp.tv_sec = vop_sec(vh);
- vbuf->timestamp.tv_usec = vop_usec(vh);
+ v4l2_get_timestamp(&vbuf->timestamp);
/* Check for motion flags */
if (solo_is_motion_on(solo_enc) && enc_buf->motion) {