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

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

[media] ivtv: Fix AUDIO_(BILINGUAL_)CHANNEL_SELECT regression 



When I converted ivtv to the new decoder API I introduced a regression in the
support of the old channel select API.

Thanks to Martin Dauskardt for reporting this.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarAndy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 556a0442

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

+2 −2
Original line number Diff line number Diff line
@@ -1763,13 +1763,13 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) 
		IVTV_DEBUG_IOCTL("AUDIO_CHANNEL_SELECT\n");

		if (iarg > AUDIO_STEREO_SWAPPED)

			return -EINVAL;

		return v4l2_ctrl_s_ctrl(itv->ctrl_audio_playback, iarg);

		return v4l2_ctrl_s_ctrl(itv->ctrl_audio_playback, iarg + 1);



	case AUDIO_BILINGUAL_CHANNEL_SELECT:

		IVTV_DEBUG_IOCTL("AUDIO_BILINGUAL_CHANNEL_SELECT\n");

		if (iarg > AUDIO_STEREO_SWAPPED)

			return -EINVAL;

		return v4l2_ctrl_s_ctrl(itv->ctrl_audio_multilingual_playback, iarg);

		return v4l2_ctrl_s_ctrl(itv->ctrl_audio_multilingual_playback, iarg + 1);



	default:

		return -EINVAL;