[media] ivtv: fix incorrect audio mode report in log_status
authorHans Verkuil <hverkuil@xs4all.nl>
Mon, 18 May 2015 13:29:17 +0000 (10:29 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sat, 30 May 2015 14:35:25 +0000 (11:35 -0300)
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 <hans.verkuil@cisco.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/pci/ivtv/ivtv-ioctl.c

index 10c31cd43e0356ffcb01d0ea6699ecd8e9b2b553..9a21c17fc3767fc84e27e76b51c6600becf6293c 100644 (file)
@@ -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;