ivtv: fix incorrect audio mode report in log_status

PATCH New Hans Verkuil 1 participant 1 message May 18, 2015

Subsystems (2)

Media (V4L/DVB) Ivtv VIDEO4LINUX driver

lore

Share & tools

lore

Hans Verkuil

author

2015-05-18 13:29 UTC #0 lore raw

PATCH 1/1 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 Hans Verkuil <[email protected]>

Tested-by Hans Verkuil <[email protected]>

Reported-by Dan Carpenter <[email protected]>

drivers/media/pci/ivtv/ivtv-ioctl.c +2 -1

index 10c31cd..9a21c17 100644
@@ -1531,7 +1531,8 @@ static int ivtv_log_status(struct file *file, void *fh)
 	ivtv_get_audio_input(itv, itv->audio_input, &audin);
 	IVTV_INFO("Video Input:  %s\n", vidin.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) {
 		struct v4l2_output vidout;
 		struct v4l2_audioout audout;