[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>
This commit is contained in:
Mauro Carvalho Chehab 2012-05-20 12:07:41 -03:00
parent efeb98b4e2
commit 6ae009a8ba

View file

@ -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;