summaryrefslogtreecommitdiff
path: root/drivers/media/usb/tm6000
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-02-01 16:08:46 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-06 00:33:27 +0400
commited57256f6fe8882cf6dde8d99f5fac5fd84c5a2d (patch)
tree695d90376ef2c588e109bccbdc0e553dbd19e193 /drivers/media/usb/tm6000
parent52dec548d4244d9ec86c58e5696e1d4ee98c7b3c (diff)
downloadlinux-ed57256f6fe8882cf6dde8d99f5fac5fd84c5a2d.tar.xz
[media] tm6000: fix G/TRY_FMT
Two fixes: - the priv field wasn't set to 0. - only V4L2_FIELD_INTERLACED is supported. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/tm6000')
-rw-r--r--drivers/media/usb/tm6000/tm6000-video.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
index f41dbb187caf..eab23413a909 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;