cx88-dvb has been incorrectly reporting the card name instead of frontend name:

DVB: registering new adapter (cx88[0]).
DVB: registering frontend 0 (DViCO FusionHDTV 3 Gold-T)...

This patch corrects this behavior, like so:

DVB: registering new adapter (cx88[0]).
DVB: registering frontend 0 (LG Electronics LGDT3302 VSB/QAM Frontend)...

Also, this removes a bad PCI subsystem ID for saa713x Sabrent card,
and renames DVICO --> DViCO for bttv.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>

4 files changed, 7 insertions, 18 deletions

diff --git a/linux/Documentation/video4linux/CARDLIST.bttv b/linux/Documentation/video4linux/CARDLIST.bttv
index 7979c060e..ec785f9f1 100644
--- a/linux/Documentation/video4linux/CARDLIST.bttv
+++ b/linux/Documentation/video4linux/CARDLIST.bttv
@@ -126,12 +126,12 @@ card=124 - AverMedia AverTV DVB-T 761
 card=125 - MATRIX Vision Sigma-SQ
 card=126 - MATRIX Vision Sigma-SLC
 card=127 - APAC Viewcomp 878(AMAX)
-card=128 - DVICO FusionHDTV DVB-T Lite
+card=128 - DViCO FusionHDTV DVB-T Lite
 card=129 - V-Gear MyVCD
 card=130 - Super TV Tuner
 card=131 - Tibet Systems 'Progress DVR' CS16
 card=132 - Kodicom 4400R (master)
 card=133 - Kodicom 4400R (slave)
 card=134 - Adlink RTV24
-card=135 - DVICO FusionHDTV 5 Lite
+card=135 - DViCO FusionHDTV 5 Lite
 card=136 - Acorp Y878F
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index ed3ce78dc..acc904e2a 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.68 2005/08/11 17:41:17 mkrufky Exp $
+    $Id: bttv-cards.c,v 1.69 2005/08/25 06:06:52 mkrufky Exp $
 
     bttv-cards.c
 
@@ -2293,7 +2293,7 @@ struct tvcard bttv_tvcards[] = {
 
 	/* ---- card 0x80 ---------------------------------- */
 	/* Chris Pascoe <c.pascoe@itee.uq.edu.au> */
-	.name           = "DVICO FusionHDTV DVB-T Lite",
+	.name           = "DViCO FusionHDTV DVB-T Lite",
 	.tuner          = -1,
 	.no_msp34xx     = 1,
 	.no_tda9875     = 1,
@@ -2427,7 +2427,7 @@ struct tvcard bttv_tvcards[] = {
 {
 	/* ---- card 0x87---------------------------------- */
 	/* Michael Krufky <mkrufky@m1k.net> */
-	.name           = "DVICO FusionHDTV 5 Lite",
+	.name           = "DViCO FusionHDTV 5 Lite",
 	.tuner          = 0,
 	.tuner_type     = TUNER_LG_TDVS_H062F,
 	.tuner_addr	= ADDR_UNSET,
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index a2e542a52..9b09d28d9 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.61 2005/08/19 15:55:16 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.62 2005/08/25 06:06:52 mkrufky Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -412,11 +412,6 @@ static int dvb_register(struct cx8802_dev *dev)
 		dev->dvb.frontend->ops->info.frequency_max = dev->core->pll_desc->max;
 	}
 
-	/* Copy the board name into the DVB structure */
-	strlcpy(dev->dvb.frontend->ops->info.name,
-		cx88_boards[dev->core->board].name,
-		sizeof(dev->dvb.frontend->ops->info.name));
-
 	/* register everything */
 	return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
 }
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index a8e0ed3b0..02c8dc9f4 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.85 2005/08/22 18:47:58 mkrufky Exp $
+ * $Id: saa7134-cards.c,v 1.86 2005/08/25 06:06:52 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * card-specific stuff.
@@ -2382,12 +2382,6 @@ struct pci_device_id saa7134_pci_tbl[] = {
 		.driver_data  = SAA7134_BOARD_VIDEOMATE_TV_PVR,
 	},{
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
-		.device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
-		.subvendor    = 0x1131,
-		.subdevice    = 0,
-		.driver_data  = SAA7134_BOARD_SABRENT_SBTTVFM,
-	},{
-		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
 		.subvendor    = 0x1461, /* Avermedia Technologies Inc */
 		.subdevice    = 0x9715,