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

Commit d118e294 authored Jun 25, 2011 by Hans Verkuil Committed by Mauro Carvalho Chehab Jul 07, 2011

[media] cx18/ivtv: fix g_tuner support



The driver shouldn't override vt->type, and the tuner name should be
based on vt->type as well.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent d16625e7

drivers/media/video/cx18/cx18-ioctl.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -695,14 +695,10 @@ static int cx18_g_tuner(struct file file, void fh, struct v4l2_tuner *vt)

		cx18_call_all(cx, tuner, g_tuner, vt);

		if (test_bit(CX18_F_I_RADIO_USER, &cx->i_flags)) {
		if (vt->type == V4L2_TUNER_RADIO)
		strlcpy(vt->name, "cx18 Radio Tuner", sizeof(vt->name));
		vt->type = V4L2_TUNER_RADIO;
		} else {
		else
		strlcpy(vt->name, "cx18 TV Tuner", sizeof(vt->name));
		vt->type = V4L2_TUNER_ANALOG_TV;
		}

		return 0;
		}

drivers/media/video/ivtv/ivtv-ioctl.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -1184,14 +1184,10 @@ static int ivtv_g_tuner(struct file file, void fh, struct v4l2_tuner *vt)

		ivtv_call_all(itv, tuner, g_tuner, vt);

		if (test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags)) {
		if (vt->type == V4L2_TUNER_RADIO)
		strlcpy(vt->name, "ivtv Radio Tuner", sizeof(vt->name));
		vt->type = V4L2_TUNER_RADIO;
		} else {
		else
		strlcpy(vt->name, "ivtv TV Tuner", sizeof(vt->name));
		vt->type = V4L2_TUNER_ANALOG_TV;
		}

		return 0;
		}