summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/s2255
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2014-02-25 23:12:19 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-05 20:34:14 +0100
commitade48681f132188599c5cefa8a3287c2a26fb738 (patch)
tree3fbc34291e9556ad4f64982bf73801f533843b49 /drivers/media/usb/s2255
parent[media] v4l: Use full 32 bits for buffer flags (diff)
downloadlinux-ade48681f132188599c5cefa8a3287c2a26fb738.tar.xz
linux-ade48681f132188599c5cefa8a3287c2a26fb738.zip
[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/s2255')
-rw-r--r--drivers/media/usb/s2255/s2255drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index ef66b1b74a9b..4c7513af2450 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -1664,7 +1664,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
q->buf_struct_size = sizeof(struct s2255_buffer);
q->mem_ops = &vb2_vmalloc_memops;
q->ops = &s2255_video_qops;
- q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+ q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
ret = vb2_queue_init(q);
if (ret != 0) {
dev_err(&dev->udev->dev,