1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c
index 1b5c695f6c59..bfd7e3474186 100644
--- a/drivers/media/v4l2-core/videobuf2-v4l2.c
+++ b/drivers/media/v4l2-core/videobuf2-v4l2.c
@@ -120,7 +120,7 @@ static int __set_timestamp(struct vb2_buffer *vb, const void *pb)
                  */
                 if ((q->timestamp_flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) ==
                                 V4L2_BUF_FLAG_TIMESTAMP_COPY)
-                        vbuf->timestamp = b->timestamp;
+                        vb->timestamp = timeval_to_ns(&b->timestamp);
                 vbuf->flags |= b->flags & V4L2_BUF_FLAG_TIMECODE;
                 if (b->flags & V4L2_BUF_FLAG_TIMECODE)
                         vbuf->timecode = b->timecode;
@@ -191,7 +191,7 @@ static int __fill_v4l2_buffer(struct vb2_buffer *vb, void *pb)
 
         b->flags = vbuf->flags;
         b->field = vbuf->field;
-        b->timestamp = vbuf->timestamp;
+        b->timestamp = ns_to_timeval(vb->timestamp);
         b->timecode = vbuf->timecode;
         b->sequence = vbuf->sequence;
         b->reserved2 = 0;
@@ -308,8 +308,7 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb,
                                         "for an output buffer\n");
                 return -EINVAL;
         }
-        vbuf->timestamp.tv_sec = 0;
-        vbuf->timestamp.tv_usec = 0;
+        vb->timestamp = 0;
         vbuf->sequence = 0;
 
         if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {