Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae009a8 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent efeb98b4

drivers/media/video/sta2x11_vip.c

+3 −3
Original line number Diff line number Diff line
@@ -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;