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

Commit 227690df authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2-ioctl.c: prefill tuner type for g_frequency and g/s_tuner 



The subdevs are supposed to receive a valid tuner type for the g_frequency
and g/s_tuner subdev ops. Some drivers do this, others don't. So prefill
this in v4l2-ioctl.c based on whether the device node from which this is
called is a radio node or not.

The spec does not require applications to fill in the type, and if they
leave it at 0 then the 'check_mode' call in tuner-core.c will return
an error and the ioctl does nothing.

Cc: stable@kernel.org
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9bf0ef06

drivers/media/video/v4l2-ioctl.c

+6 −0
Original line number Diff line number Diff line
@@ -1822,6 +1822,8 @@ static long __video_do_ioctl(struct file *file, 
		if (!ops->vidioc_g_tuner)

			break;



		p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?

			V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

		ret = ops->vidioc_g_tuner(file, fh, p);

		if (!ret)

			dbgarg(cmd, "index=%d, name=%s, type=%d, "
@@ -1840,6 +1842,8 @@ static long __video_do_ioctl(struct file *file, 


		if (!ops->vidioc_s_tuner)

			break;

		p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?

			V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

		dbgarg(cmd, "index=%d, name=%s, type=%d, "

				"capability=0x%x, rangelow=%d, "

				"rangehigh=%d, signal=%d, afc=%d, "
@@ -1858,6 +1862,8 @@ static long __video_do_ioctl(struct file *file, 
		if (!ops->vidioc_g_frequency)

			break;



		p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?

			V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

		ret = ops->vidioc_g_frequency(file, fh, p);

		if (!ret)

			dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n",