]> err.no Git - linux-2.6/commitdiff
[PATCH] v4l: 708: full mute of saa7134 on mute command
authorNickolay V. Shmyrev <nshmyrev@yandex.ru>
Wed, 9 Nov 2005 05:37:01 +0000 (21:37 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 15:56:14 +0000 (07:56 -0800)
- Full mute of saa7134 on mute command.

Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/media/video/saa7134/saa7134-tvaudio.c

index 61a2d6b50eef29ad67948a5a04a324fcde367554..fdca6c563b963fe887a6835227857277cc9b27e9 100644 (file)
@@ -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) {