summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2005-06-25 19:47:02 +0000
committerNickolay V. Shmyrev <devnull@localhost>2005-06-25 19:47:02 +0000
commit9f247b36ea32a916e23c527a636e77409f655300 (patch)
tree275c451c793f5f27b068ede50ca18c17afd0b68a /linux
parenta5bbab7045a7a6f93f1fefe29ff657fdcc4729e2 (diff)
downloadmediapointer-dvb-s2-9f247b36ea32a916e23c527a636e77409f655300.tar.gz
mediapointer-dvb-s2-9f247b36ea32a916e23c527a636e77409f655300.tar.bz2
* saa7134-cards.c:
- When switching external mux on mute, switch internal mux to TV. Thanks to Konrad Rzepecki <hannibal@megapolis.pl>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 3eb04df49..1bb5ed381 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-cards.c,v 1.73 2005/06/22 23:37:34 nsh Exp $
+ * $Id: saa7134-cards.c,v 1.74 2005/06/25 19:47:02 nsh Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -130,7 +130,7 @@ struct saa7134_board saa7134_boards[] = {
},
.mute = {
.name = name_mute,
- .amux = LINE2,
+ .amux = TV,
.gpio = 0x8000,
},
},
@@ -247,7 +247,7 @@ struct saa7134_board saa7134_boards[] = {
},
.mute = {
.name = name_mute,
- .amux = LINE2,
+ .amux = TV,
.gpio = 0x10000,
},
},
@@ -695,7 +695,6 @@ struct saa7134_board saa7134_boards[] = {
},
.mute = {
.name = name_mute,
- .amux = LINE2,
.gpio = 0x0000,
},
@@ -1529,7 +1528,7 @@ struct saa7134_board saa7134_boards[] = {
},
.mute = {
.name = name_mute,
- .amux = LINE1,
+ .amux = TV,
.gpio = 0x01,
},
},
@@ -1877,7 +1876,7 @@ struct saa7134_board saa7134_boards[] = {
},
.mute = {
.name = name_mute,
- .amux = LINE1,
+ .amux = TV,
.gpio = 0x000,
},
},
@@ -1965,7 +1964,7 @@ struct saa7134_board saa7134_boards[] = {
then gradually increases after channel change.
- Overlay scaling problems (application error?)
- Composite S-Video untested.
- From: Hannibal <hannibal@megapolis.pl>
+ From: Konrad Rzepecki <hannibal@megapolis.pl>
*/
.name = "Kworld Xpert TV PVR7134",
.audio_clock = 0x00187de7,
@@ -1998,7 +1997,7 @@ struct saa7134_board saa7134_boards[] = {
},
.mute = {
.name = name_mute,
- .amux = LINE1,
+ .amux = TV,
.gpio = 0x000,
},
},