summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBrandon Philips <bphilips@suse.de>2007-09-28 03:54:52 +0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-10 07:03:00 +0400
commita326ae1126fddd07728e854322e0c657c6b1fbda (patch)
tree1fb751711ef50dd13828fb12bb35d39abef35da0 /drivers
parent11f7078c10944437b6cf335cea50ed7da675a8b1 (diff)
downloadlinux-a326ae1126fddd07728e854322e0c657c6b1fbda.tar.xz
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')
-rw-r--r--drivers/media/video/vivi.c3
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,
field = f->fmt.pix.field;
if (field == V4L2_FIELD_ANY) {
-// field=V4L2_FIELD_INTERLACED;
- field=V4L2_FIELD_SEQ_TB;
+ field=V4L2_FIELD_INTERLACED;
} else if (V4L2_FIELD_INTERLACED != field) {
dprintk(1,"Field type invalid.\n");
return -EINVAL;