From: Hans Verkuil <[email protected]>

Two fixes:

- the priv field wasn't set to 0.
- only V4L2_FIELD_INTERLACED is supported.

Signed-off-by: Hans Verkuil <[email protected]>
---
 drivers/media/usb/tm6000/tm6000-video.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/media/usb/tm6000/tm6000-video.c 
b/drivers/media/usb/tm6000/tm6000-video.c
index f41dbb1..eab2341 100644
--- a/drivers/media/usb/tm6000/tm6000-video.c
+++ b/drivers/media/usb/tm6000/tm6000-video.c
@@ -918,6 +918,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void 
*priv,
                (f->fmt.pix.width * fh->fmt->depth) >> 3;
        f->fmt.pix.sizeimage =
                f->fmt.pix.height * f->fmt.pix.bytesperline;
+       f->fmt.pix.priv = 0;
 
        return 0;
 }
@@ -948,12 +949,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void 
*priv,
 
        field = f->fmt.pix.field;
 
-       if (field == V4L2_FIELD_ANY)
-               field = V4L2_FIELD_SEQ_TB;
-       else if (V4L2_FIELD_INTERLACED != field) {
-               dprintk(dev, V4L2_DEBUG_IOCTL_ARG, "Field type invalid.\n");
-               return -EINVAL;
-       }
+       field = V4L2_FIELD_INTERLACED;
 
        tm6000_get_std_res(dev);
 
@@ -963,6 +959,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void 
*priv,
        f->fmt.pix.width &= ~0x01;
 
        f->fmt.pix.field = field;
+       f->fmt.pix.priv = 0;
 
        f->fmt.pix.bytesperline =
                (f->fmt.pix.width * fmt->depth) >> 3;
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to