diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 12:07:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 12:07:41 -0300 |
| commit | 6ae009a8ba512d5b07386bbb1172cfd7a02986aa (patch) | |
| tree | 84725be02b8c81ee63604c2599e4293ee3be6d0d /drivers/media/video/sta2x11_vip.c | |
| parent | efeb98b4e2b2ce50e008affce4c493e58167144a (diff) | |
| download | linux-3.10-6ae009a8ba512d5b07386bbb1172cfd7a02986aa.tar.gz linux-3.10-6ae009a8ba512d5b07386bbb1172cfd7a02986aa.tar.bz2 linux-3.10-6ae009a8ba512d5b07386bbb1172cfd7a02986aa.zip | |
[media] sta2x11_vip: Fix 60Hz video standard handling
This device supports V4L2_STD_ALL, but its check for 60Hz standards
is broken, as NTSC is not the only standard that uses 60Hz.
Cc: Federico Vaga <federico.vaga@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/sta2x11_vip.c')
| -rw-r--r-- | drivers/media/video/sta2x11_vip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/sta2x11_vip.c b/drivers/media/video/sta2x11_vip.c index 636643f0a18..4c10205264d 100644 --- a/drivers/media/video/sta2x11_vip.c +++ b/drivers/media/video/sta2x11_vip.c @@ -572,7 +572,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std) return -EIO; *std = vip->std = newstd; if (oldstd != *std) { - if (V4L2_STD_NTSC & (*std)) + if (V4L2_STD_525_60 & (*std)) vip->format = formats_60[0]; else vip->format = formats_50[0]; @@ -581,7 +581,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *std) } if (oldstd != *std) { - if (V4L2_STD_NTSC & (*std)) + if (V4L2_STD_525_60 & (*std)) vip->format = formats_60[0]; else vip->format = formats_50[0]; @@ -804,7 +804,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, if (V4L2_PIX_FMT_UYVY != f->fmt.pix.pixelformat) return -EINVAL; - if (V4L2_STD_NTSC & vip->std) + if (V4L2_STD_525_60 & vip->std) interlace_lim = 240; else interlace_lim = 288; |