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

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

[media] ivtv: fix incorrect audio mode report in log_status 



The log_status ioctl should report if the audio input has mode Bilingual. However, the
check against the itv->dualwatch_stereo_mode is completely wrong and is a left-over from
the distant past. Not only is the bitmask obviously wrong, the test itself is broken too
since itv->dualwatch_stereo_mode is no longer a bitmask at all.

Fix this code properly.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent ddfa6c63

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1531,7 +1531,8 @@ static int ivtv_log_status(struct file *file, void *fh) 
	ivtv_get_audio_input(itv, itv->audio_input, &audin);

	ivtv_get_audio_input(itv, itv->audio_input, &audin);

	IVTV_INFO("Video Input:  %s\n", vidin.name);

	IVTV_INFO("Video Input:  %s\n", vidin.name);

	IVTV_INFO("Audio Input:  %s%s\n", audin.name,

	IVTV_INFO("Audio Input:  %s%s\n", audin.name,

		(itv->dualwatch_stereo_mode & ~0x300) == 0x200 ? " (Bilingual)" : "");

		itv->dualwatch_stereo_mode == V4L2_MPEG_AUDIO_MODE_DUAL ?

			" (Bilingual)" : "");

	if (has_output) {

	if (has_output) {

		struct v4l2_output vidout;

		struct v4l2_output vidout;

		struct v4l2_audioout audout;

		struct v4l2_audioout audout;