summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/msi3101/sdr-msi3101.c
diff options
context:
space:
mode:
authorSakari Ailus2014-02-25 23:12:19 +0100
committerMauro Carvalho Chehab2014-03-05 20:34:14 +0100
commitade48681f132188599c5cefa8a3287c2a26fb738 (patch)
tree3fbc34291e9556ad4f64982bf73801f533843b49 /drivers/staging/media/msi3101/sdr-msi3101.c
parent[media] v4l: Use full 32 bits for buffer flags (diff)
downloadkernel-qcow2-linux-ade48681f132188599c5cefa8a3287c2a26fb738.tar.gz
kernel-qcow2-linux-ade48681f132188599c5cefa8a3287c2a26fb738.tar.xz
kernel-qcow2-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/staging/media/msi3101/sdr-msi3101.c')
-rw-r--r--drivers/staging/media/msi3101/sdr-msi3101.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/msi3101/sdr-msi3101.c b/drivers/staging/media/msi3101/sdr-msi3101.c
index 4c3bf776bb20..04ff29e597b8 100644
--- a/drivers/staging/media/msi3101/sdr-msi3101.c
+++ b/drivers/staging/media/msi3101/sdr-msi3101.c
@@ -1851,7 +1851,7 @@ static int msi3101_probe(struct usb_interface *intf,
s->vb_queue.buf_struct_size = sizeof(struct msi3101_frame_buf);
s->vb_queue.ops = &msi3101_vb2_ops;
s->vb_queue.mem_ops = &vb2_vmalloc_memops;
- s->vb_queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+ s->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
ret = vb2_queue_init(&s->vb_queue);
if (ret < 0) {
dev_err(&s->udev->dev, "Could not initialize vb2 queue\n");