From d0fe151f984d0b6a3046903d691e879955f5ac4f Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 1 Feb 2013 09:08:46 -0300 Subject: [PATCH] --- yaml --- r: 357461 b: refs/heads/master c: ed57256f6fe8882cf6dde8d99f5fac5fd84c5a2d h: refs/heads/master i: 357459: 6f6639afe0c305033d1b38554cef0ca0e12c8811 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/tm6000/tm6000-video.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6766a6eed2b0..2f19b86b9c76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52dec548d4244d9ec86c58e5696e1d4ee98c7b3c +refs/heads/master: ed57256f6fe8882cf6dde8d99f5fac5fd84c5a2d diff --git a/trunk/drivers/media/usb/tm6000/tm6000-video.c b/trunk/drivers/media/usb/tm6000/tm6000-video.c index f41dbb187caf..eab23413a909 100644 --- a/trunk/drivers/media/usb/tm6000/tm6000-video.c +++ b/trunk/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;