Merge branch 'pipe-exclusive-wakeup'

[linux.git] / drivers / media / v4l2-core / v4l2-event.c

diff --git a/drivers/media/v4l2-core/v4l2-event.c b/drivers/media/v4l2-core/v4l2-event.c
index 9d673d113d7acd7b41cec2bfb2eec4b9a70ee58c..290c6b2131797c2d1229a027c5fef050b5553d8e 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-event.c
+++ b/drivers/media/v4l2-core/v4l2-event.c
@@ -27,6 +27,7 @@ static unsigned sev_pos(const struct v4l2_subscribed_event *sev, unsigned idx)
 static int __v4l2_event_dequeue(struct v4l2_fh *fh, struct v4l2_event *event)
 {
        struct v4l2_kevent *kev;
+       struct timespec64 ts;
        unsigned long flags;
 
        spin_lock_irqsave(&fh->vdev->fh_lock, flags);
@@ -44,7 +45,9 @@ static int __v4l2_event_dequeue(struct v4l2_fh *fh, struct v4l2_event *event)
 
        kev->event.pending = fh->navailable;
        *event = kev->event;
-       event->timestamp = ns_to_timespec(kev->ts);
+       ts = ns_to_timespec64(kev->ts);
+       event->timestamp.tv_sec = ts.tv_sec;
+       event->timestamp.tv_nsec = ts.tv_nsec;
        kev->sev->first = sev_pos(kev->sev, 1);
        kev->sev->in_use--;