diff options
| author | Sakari Ailus <sakari.ailus@iki.fi> | 2014-02-25 19:12:19 -0300 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-08-08 15:24:09 +0900 |
| commit | 8cfdb90d37c957ff5177ba0ea7b856f9d2236d8b (patch) | |
| tree | c30011c5fbdae08c717228280e285cd7ae30ab18 /drivers/media/usb/stk1160 | |
| parent | ed157a3acb85620d13cd599985e3a20f1dc08a00 (diff) | |
| download | linux-3.10-8cfdb90d37c957ff5177ba0ea7b856f9d2236d8b.tar.gz linux-3.10-8cfdb90d37c957ff5177ba0ea7b856f9d2236d8b.tar.bz2 linux-3.10-8cfdb90d37c957ff5177ba0ea7b856f9d2236d8b.zip | |
upstream: [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>
Conflicts:
drivers/media/platform/mem2mem_testdev.c
drivers/media/platform/s5p-g2d/g2d.c
drivers/staging/media/msi3101/sdr-msi3101.c
Diffstat (limited to 'drivers/media/usb/stk1160')
| -rw-r--r-- | drivers/media/usb/stk1160/stk1160-v4l.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c index c45c9881bb5..37bc00f418f 100644 --- a/drivers/media/usb/stk1160/stk1160-v4l.c +++ b/drivers/media/usb/stk1160/stk1160-v4l.c @@ -641,7 +641,7 @@ int stk1160_vb2_setup(struct stk1160 *dev) q->buf_struct_size = sizeof(struct stk1160_buffer); q->ops = &stk1160_video_qops; q->mem_ops = &vb2_vmalloc_memops; - q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; + q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; rc = vb2_queue_init(q); if (rc < 0) |