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

Commit 50e9efd6 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] pvrusb2: fix g/s_tuner support 



The tuner-core subdev requires that the type field of v4l2_tuner is
filled in correctly. This is done in v4l2-ioctl.c, but pvrusb2 doesn't
use that yet, so we have to do it manually based on whether the current
input is radio or not.

Tested with my pvrusb2.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarMike Isely <isely@pobox.com>
Cc: stable@kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 227690df

drivers/media/video/pvrusb2/pvrusb2-hdw.c

+4 −0
Original line number Diff line number Diff line
@@ -3046,6 +3046,8 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw) 
	if (hdw->input_dirty || hdw->audiomode_dirty || hdw->force_dirty) {

		struct v4l2_tuner vt;

		memset(&vt, 0, sizeof(vt));

		vt.type = (hdw->input_val == PVR2_CVAL_INPUT_RADIO) ?

			V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

		vt.audmode = hdw->audiomode_val;

		v4l2_device_call_all(&hdw->v4l2_dev, 0, tuner, s_tuner, &vt);

	}
@@ -5171,6 +5173,8 @@ void pvr2_hdw_status_poll(struct pvr2_hdw *hdw) 
{

	struct v4l2_tuner *vtp = &hdw->tuner_signal_info;

	memset(vtp, 0, sizeof(*vtp));

	vtp->type = (hdw->input_val == PVR2_CVAL_INPUT_RADIO) ?

		V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

	hdw->tuner_signal_stale = 0;

	/* Note: There apparently is no replacement for VIDIOC_CROPCAP

	   using v4l2-subdev - therefore we can't support that AT ALL right