summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/bttv-cards.c4
-rw-r--r--v4l/ChangeLog8
2 files changed, 10 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index b90f02d61..c92d06ddb 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-cards.c,v 1.79 2005/09/24 01:11:14 mkrufky Exp $
+ $Id: bttv-cards.c,v 1.80 2005/09/24 19:38:05 mkrufky Exp $
bttv-cards.c
@@ -2432,7 +2432,7 @@ struct tvcard bttv_tvcards[] = {
.svhs = 2,
.muxsel = { 2, 3 },
.gpiomask = 0x00e00007,
- .audiomux = { 0x00400005, 0, 0, 0, 0x00400007, 0 },
+ .audiomux = { 0x00400005, 0, 0x00000009, 0, 0x00c00007, 0 },
.no_msp34xx = 1,
.no_tda9875 = 1,
.no_tda7432 = 1,
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index f721d8016..bd30290ca 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-24 19:34 mkrufky
+
+ * bttv-cards.c:
+ - fixed GPIO composite and off (dvb) states to prevent
+ lgdt3303 frontend from dying on input source change.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-09-24 17:03 mkrufky
* compat.h: