Merge remote-tracking branch 'btrfs-kdave/for-next'

[karo-tx-linux.git] / drivers / media / usb / stk1160 / stk1160-video.c

diff --git a/drivers/media/usb/stk1160/stk1160-video.c b/drivers/media/usb/stk1160/stk1160-video.c
index 75654e676e80c9f9d716830c2802e20281305a18..46191d5262eb07f3efb9fdf87c75c0665abe6687 100644 (file)
--- a/drivers/media/usb/stk1160/stk1160-video.c
+++ b/drivers/media/usb/stk1160/stk1160-video.c
@@ -99,7 +99,7 @@ void stk1160_buffer_done(struct stk1160 *dev)
        buf->vb.sequence = dev->sequence++;
        buf->vb.field = V4L2_FIELD_INTERLACED;
        buf->vb.vb2_buf.planes[0].bytesused = buf->bytesused;
-       v4l2_get_timestamp(&buf->vb.timestamp);
+       buf->vb.vb2_buf.timestamp = ktime_get_ns();
 
        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->bytesused);
        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);