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

Commit 20deebfe authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: fix tuner/frequency handling 



v4l2-compliance found problems with frequency clamping that wasn't
reported correctly and missing tuner index checks.
Also removed unnecessary tuner type checks (these are now done by the
v4l2 core).

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 319a55fb

drivers/media/usb/em28xx/em28xx-video.c

+5 −8
Original line number Diff line number Diff line
@@ -1322,7 +1322,6 @@ static int vidioc_g_tuner(struct file *file, void *priv, 
		return -EINVAL;



	strcpy(t->name, "Tuner");

	t->type = V4L2_TUNER_ANALOG_TV;



	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, g_tuner, t);

	return 0;
@@ -1352,7 +1351,9 @@ static int vidioc_g_frequency(struct file *file, void *priv, 
	struct em28xx_fh      *fh  = priv;

	struct em28xx         *dev = fh->dev;



	f->type = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

	if (0 != f->tuner)

		return -EINVAL;



	f->frequency = dev->ctl_freq;

	return 0;

}
@@ -1371,13 +1372,9 @@ static int vidioc_s_frequency(struct file *file, void *priv, 
	if (0 != f->tuner)

		return -EINVAL;



	if (unlikely(0 == fh->radio && f->type != V4L2_TUNER_ANALOG_TV))

		return -EINVAL;

	if (unlikely(1 == fh->radio && f->type != V4L2_TUNER_RADIO))

		return -EINVAL;



	dev->ctl_freq = f->frequency;

	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, f);

	v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, g_frequency, f);

	dev->ctl_freq = f->frequency;



	return 0;

}