Merge branch 'sfc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc

[~andy/linux] / drivers / media / usb / cpia2 / cpia2_v4l.c

diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c
index aeb9d227572583e077a134e6133d9766793cc215..d5d42b6e94be128d49ec8a4dd2a0d8c452c42f48 100644 (file)
--- a/drivers/media/usb/cpia2/cpia2_v4l.c
+++ b/drivers/media/usb/cpia2/cpia2_v4l.c
@@ -825,6 +825,8 @@ static int cpia2_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf)
        else
                buf->flags = 0;
 
+       buf->flags |= V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+
        switch (cam->buffers[buf->index].status) {
        case FRAME_EMPTY:
        case FRAME_ERROR:
@@ -943,7 +945,8 @@ static int cpia2_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
 
        buf->index = frame;
        buf->bytesused = cam->buffers[buf->index].length;
-       buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE;
+       buf->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_DONE
+               | V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
        buf->field = V4L2_FIELD_NONE;
        buf->timestamp = cam->buffers[buf->index].timestamp;
        buf->sequence = cam->buffers[buf->index].seq;