aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/ivtv/ivtv-fileops.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index fedddecf661e..9e867b5229d1 100644
--- 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)
924 924
925void ivtv_mute(struct ivtv *itv) 925void ivtv_mute(struct ivtv *itv)
926{ 926{
927 struct v4l2_control ctrl = { V4L2_CID_AUDIO_MUTE, 1 };
928
929 /* Mute sound to avoid pop */
930 ivtv_control_ioctls(itv, VIDIOC_S_CTRL, &ctrl);
931
932 if (atomic_read(&itv->capturing)) 927 if (atomic_read(&itv->capturing))
933 ivtv_vapi(itv, CX2341X_ENC_MUTE_AUDIO, 1, 1); 928 ivtv_vapi(itv, CX2341X_ENC_MUTE_AUDIO, 1, 1);
934
935 IVTV_DEBUG_INFO("Mute\n"); 929 IVTV_DEBUG_INFO("Mute\n");
936} 930}
937 931
938void ivtv_unmute(struct ivtv *itv) 932void ivtv_unmute(struct ivtv *itv)
939{ 933{
940 struct v4l2_control ctrl = { V4L2_CID_AUDIO_MUTE, 0 };
941
942 /* initialize or refresh input */ 934 /* initialize or refresh input */
943 if (atomic_read(&itv->capturing) == 0) 935 if (atomic_read(&itv->capturing) == 0)
944 ivtv_vapi(itv, CX2341X_ENC_INITIALIZE_INPUT, 0); 936 ivtv_vapi(itv, CX2341X_ENC_INITIALIZE_INPUT, 0);
@@ -949,8 +941,5 @@ void ivtv_unmute(struct ivtv *itv)
949 ivtv_vapi(itv, CX2341X_ENC_MISC, 1, 12); 941 ivtv_vapi(itv, CX2341X_ENC_MISC, 1, 12);
950 ivtv_vapi(itv, CX2341X_ENC_MUTE_AUDIO, 1, 0); 942 ivtv_vapi(itv, CX2341X_ENC_MUTE_AUDIO, 1, 0);
951 } 943 }
952
953 /* Unmute */
954 ivtv_control_ioctls(itv, VIDIOC_S_CTRL, &ctrl);
955 IVTV_DEBUG_INFO("Unmute\n"); 944 IVTV_DEBUG_INFO("Unmute\n");
956} 945}