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>

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 650e959aeb7820f064359e3a0d109f8c9564b69b..512128a6f58c6f0b1e1b75a71082fa56f741d097 100644 (file)
--- 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;