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

Commit 5fa7b9f3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11275): tvaudio: fix mute and s/g_tuner handling 



The mute control depends on CHIP_HAS_INPUTSEL, so test for that first.

The s/g_tuner code should check whether getmode/setmode is set at the
beginning instead of filling in the struct and discovering at
the end that this chip doesn't implement audiomodes after all (i.e. is
a simple muxer chip).

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8f84a775

drivers/media/video/tvaudio.c

+19 −5
Original line number Diff line number Diff line
@@ -1511,6 +1511,8 @@ static int tvaudio_g_ctrl(struct v4l2_subdev *sd, 


	switch (ctrl->id) {

	case V4L2_CID_AUDIO_MUTE:

		if (!(desc->flags & CHIP_HAS_INPUTSEL))

			break;

		ctrl->value=chip->muted;

		return 0;

	case V4L2_CID_AUDIO_VOLUME:
@@ -1552,6 +1554,9 @@ static int tvaudio_s_ctrl(struct v4l2_subdev *sd, 


	switch (ctrl->id) {

	case V4L2_CID_AUDIO_MUTE:

		if (!(desc->flags & CHIP_HAS_INPUTSEL))

			break;



		if (ctrl->value < 0 || ctrl->value >= 2)

			return -ERANGE;

		chip->muted = ctrl->value;
@@ -1636,7 +1641,9 @@ static int tvaudio_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 


	switch (qc->id) {

	case V4L2_CID_AUDIO_MUTE:

		if (desc->flags & CHIP_HAS_INPUTSEL)

			return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);

		break;

	case V4L2_CID_AUDIO_VOLUME:

		if (desc->flags & CHIP_HAS_VOLUME)

			return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 58880);
@@ -1661,7 +1668,9 @@ static int tvaudio_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing * 
	struct CHIPSTATE *chip = to_state(sd);

	struct CHIPDESC *desc = chip->desc;



	if (!(desc->flags & CHIP_HAS_INPUTSEL) || rt->input >= 4)

	if (!(desc->flags & CHIP_HAS_INPUTSEL))

		return 0;

	if (rt->input >= 4)

		return -EINVAL;

	/* There are four inputs: tuner, radio, extern and intern. */

	chip->input = rt->input;
@@ -1678,8 +1687,11 @@ static int tvaudio_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) 
	struct CHIPDESC *desc = chip->desc;

	int mode = 0;



	if (!desc->setmode)

		return 0;

	if (chip->radio)

		return 0;



	switch (vt->audmode) {

	case V4L2_TUNER_MODE_MONO:

	case V4L2_TUNER_MODE_STEREO:
@@ -1695,7 +1707,7 @@ static int tvaudio_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) 
	}

	chip->audmode = vt->audmode;



	if (desc->setmode && mode) {

	if (mode) {

		chip->watch_stereo = 0;

		/* del_timer(&chip->wt); */

		chip->mode = mode;
@@ -1710,14 +1722,16 @@ static int tvaudio_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) 
	struct CHIPDESC *desc = chip->desc;

	int mode = V4L2_TUNER_MODE_MONO;



	if (!desc->getmode)

		return 0;

	if (chip->radio)

		return 0;



	vt->audmode = chip->audmode;

	vt->rxsubchans = 0;

	vt->capability = V4L2_TUNER_CAP_STEREO |

		V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;



	if (desc->getmode)

	mode = desc->getmode(chip);



	if (mode & V4L2_TUNER_MODE_MONO)