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.verk...@cisco.com>
Tested-by: Hans Verkuil <hans.verk...@cisco.com>
Reported-by: Dan Carpenter <dan.carpen...@oracle.com>

diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c 
b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 10c31cd..9a21c17 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -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;
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to