瀏覽代碼

[PATCH] v4l: 708: full mute of saa7134 on mute command

- 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>
Nickolay V. Shmyrev 19 年之前
父節點
當前提交
1eaad5b113
共有 1 個文件被更改,包括 9 次插入1 次删除
  1. 9 1
      drivers/media/video/saa7134/saa7134-tvaudio.c

+ 9 - 1
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));
 	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)
 static void mute_input_7134(struct saa7134_dev *dev)
 {
 {
 	unsigned int mute;
 	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)
 	if (PCI_DEVICE_ID_PHILIPS_SAA7134 == dev->pci->device)
 		/* 7134 mute */
 		/* 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 internal audio mux */
 	switch (in->amux) {
 	switch (in->amux) {