summaryrefslogtreecommitdiff
path: root/drivers/media/usb/airspy
diff options
context:
space:
mode:
authorJunghak Sung <jh1009.sung@samsung.com>2015-11-03 13:16:37 +0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-18 18:53:31 +0300
commitd6dd645eae76eeb42cb47d9da69cd3f56b3f2cb6 (patch)
tree7cd1f67b772a7829c832aca35a69454b162ab2d0 /drivers/media/usb/airspy
parent9057bc2b35cfdb5b5fb7d93708f11de5dd9b6b2e (diff)
downloadlinux-d6dd645eae76eeb42cb47d9da69cd3f56b3f2cb6.tar.xz
[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/usb/airspy')
-rw-r--r--drivers/media/usb/airspy/airspy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c
index 518d511e49ee..b5595ca81189 100644
--- a/drivers/media/usb/airspy/airspy.c
+++ b/drivers/media/usb/airspy/airspy.c
@@ -316,7 +316,7 @@ static void airspy_urb_complete(struct urb *urb)
len = airspy_convert_stream(s, ptr, urb->transfer_buffer,
urb->actual_length);
vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0, len);
- v4l2_get_timestamp(&fbuf->vb.timestamp);
+ fbuf->vb.vb2_buf.timestamp = ktime_get_ns();
fbuf->vb.sequence = s->sequence++;
vb2_buffer_done(&fbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
}