diff options
author | Brandon Philips <bphilips@suse.de> | 2007-09-27 19:54:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 23:03:00 -0400 |
commit | a326ae1126fddd07728e854322e0c657c6b1fbda (patch) | |
tree | 1fb751711ef50dd13828fb12bb35d39abef35da0 /drivers/media | |
parent | 11f7078c10944437b6cf335cea50ed7da675a8b1 (diff) |
V4L/DVB (6273): V4L: vivi.c vidioc_try_fmt_cap() negotiate a valid field
If the client provides V4L2_FIELD_ANY vivi should return a valid field :)
Signed-off-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/vivi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 650e959aeb78..512128a6f58c 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -820,8 +820,7 @@ static int vidioc_try_fmt_cap (struct file *file, void *priv, | |||
820 | field = f->fmt.pix.field; | 820 | field = f->fmt.pix.field; |
821 | 821 | ||
822 | if (field == V4L2_FIELD_ANY) { | 822 | if (field == V4L2_FIELD_ANY) { |
823 | // field=V4L2_FIELD_INTERLACED; | 823 | field=V4L2_FIELD_INTERLACED; |
824 | field=V4L2_FIELD_SEQ_TB; | ||
825 | } else if (V4L2_FIELD_INTERLACED != field) { | 824 | } else if (V4L2_FIELD_INTERLACED != field) { |
826 | dprintk(1,"Field type invalid.\n"); | 825 | dprintk(1,"Field type invalid.\n"); |
827 | return -EINVAL; | 826 | return -EINVAL; |