V4L/DVB (5998): ivtv: no need to mute the audio input

When changing channels the audio has to be muted. This is done
by calling CX2341X_ENC_MUTE_AUDIO and by muted the audio input.
The latter is not necessary and is now removed.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index fedddecf661ef926222d92bb204d82195803835b..9e867b5229d19b583fa945020347ce5f2f72689e 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -924,21 +924,13 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp)
 
 void ivtv_mute(struct ivtv *itv)
 {
-       struct v4l2_control ctrl = { V4L2_CID_AUDIO_MUTE, 1 };
-
-       /* Mute sound to avoid pop */
-       ivtv_control_ioctls(itv, VIDIOC_S_CTRL, &ctrl);
-
        if (atomic_read(&itv->capturing))
                ivtv_vapi(itv, CX2341X_ENC_MUTE_AUDIO, 1, 1);
-
        IVTV_DEBUG_INFO("Mute\n");
 }
 
 void ivtv_unmute(struct ivtv *itv)
 {
-       struct v4l2_control ctrl = { V4L2_CID_AUDIO_MUTE, 0 };
-
        /* initialize or refresh input */
        if (atomic_read(&itv->capturing) == 0)
                ivtv_vapi(itv, CX2341X_ENC_INITIALIZE_INPUT, 0);
@@ -949,8 +941,5 @@ void ivtv_unmute(struct ivtv *itv)
                ivtv_vapi(itv, CX2341X_ENC_MISC, 1, 12);
                ivtv_vapi(itv, CX2341X_ENC_MUTE_AUDIO, 1, 0);
        }
-
-       /* Unmute */
-       ivtv_control_ioctls(itv, VIDIOC_S_CTRL, &ctrl);
        IVTV_DEBUG_INFO("Unmute\n");
 }