diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2014-02-25 17:12:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-05 14:34:14 -0500 |
commit | ade48681f132188599c5cefa8a3287c2a26fb738 (patch) | |
tree | 3fbc34291e9556ad4f64982bf73801f533843b49 /drivers/media/usb/uvc/uvc_queue.c | |
parent | 939f1377fbdb5d0d6d6ee1e234b8ab9328ca77ef (diff) |
[media] v4l: Rename vb2_queue.timestamp_type as timestamp_flags
The timestamp_type field used to contain only the timestamp type. Soon it
will be used for timestamp source flags as well. Rename the field
accordingly.
[m.chehab@samsung.com: do the change also to drivers/staging/media and at s2255]
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/uvc/uvc_queue.c')
-rw-r--r-- | drivers/media/usb/uvc/uvc_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c index ff7be9702486..7c146167b103 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c | |||
@@ -151,7 +151,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type, | |||
151 | queue->queue.buf_struct_size = sizeof(struct uvc_buffer); | 151 | queue->queue.buf_struct_size = sizeof(struct uvc_buffer); |
152 | queue->queue.ops = &uvc_queue_qops; | 152 | queue->queue.ops = &uvc_queue_qops; |
153 | queue->queue.mem_ops = &vb2_vmalloc_memops; | 153 | queue->queue.mem_ops = &vb2_vmalloc_memops; |
154 | queue->queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; | 154 | queue->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; |
155 | ret = vb2_queue_init(&queue->queue); | 155 | ret = vb2_queue_init(&queue->queue); |
156 | if (ret) | 156 | if (ret) |
157 | return ret; | 157 | return ret; |