1 files changed, 17 insertions, 6 deletions

diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 61a2d6b50ee..93268427750 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -207,6 +207,10 @@ static void tvaudio_setcarrier(struct saa7134_dev *dev,
         saa_writel(SAA7134_CARRIER2_FREQ0 >> 2, tvaudio_carr2reg(secondary));
 }
 
+#define SAA7134_MUTE_MASK 0xbb
+#define SAA7134_MUTE_ANALOG 0x04
+#define SAA7134_MUTE_I2S 0x40
+
 static void mute_input_7134(struct saa7134_dev *dev)
 {
         unsigned int mute;
@@ -241,7 +245,11 @@ static void mute_input_7134(struct saa7134_dev *dev)
 
         if (PCI_DEVICE_ID_PHILIPS_SAA7134 == dev->pci->device)
                 /* 7134 mute */
-                saa_writeb(SAA7134_AUDIO_MUTE_CTRL, mute ? 0xbf : 0xbb);
+                saa_writeb(SAA7134_AUDIO_MUTE_CTRL, mute ?
+                                                    SAA7134_MUTE_MASK |
+                                                    SAA7134_MUTE_ANALOG |
+                                                    SAA7134_MUTE_I2S :
+                                                    SAA7134_MUTE_MASK);
 
         /* switch internal audio mux */
         switch (in->amux) {
@@ -753,17 +761,17 @@ static int mute_input_7133(struct saa7134_dev *dev)
 
 
         /* switch gpio-connected external audio mux */
-        if (0 != card(dev).gpiomask) {
-                mask = card(dev).gpiomask;
+        if (0 != card(dev).gpiomask) {
+                mask = card(dev).gpiomask;
 
                 if (card(dev).mute.name && dev->ctl_mute)
                         in = &card(dev).mute;
                 else
                         in = dev->input;
 
-                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   mask, mask);
-                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio);
-                saa7134_track_gpio(dev,in->name);
+                saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   mask, mask);
+                saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio);
+                saa7134_track_gpio(dev,in->name);
         }
 
         return 0;
@@ -1016,9 +1024,12 @@ int saa7134_tvaudio_do_scan(struct saa7134_dev *dev)
         return 0;
 }
 
+EXPORT_SYMBOL(saa_dsp_writel);
+
 /* ----------------------------------------------------------- */
 /*
  * Local variables:
  * c-basic-offset: 8
  * End:
  */
+