Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] v4l: cx88-dvb incorrect reporting fixed and remove bad PCI ID for Sabrent

- cx88-dvb has been incorrectly reporting the card name instead of frontend name
- Removes a bad PCI subsystem ID for saa713x Sabrent card
- Renames DVICO --> DViCO for bttv.
- #include <linux/config.h> no longer needed.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Mauro Carvalho Chehab and committed by
Linus Torvalds
10c35cf8 4279f024

+4 -16
+2 -2
Documentation/video4linux/CARDLIST.bttv
··· 126 126 card=125 - MATRIX Vision Sigma-SQ 127 127 card=126 - MATRIX Vision Sigma-SLC 128 128 card=127 - APAC Viewcomp 878(AMAX) 129 - card=128 - DVICO FusionHDTV DVB-T Lite 129 + card=128 - DViCO FusionHDTV DVB-T Lite 130 130 card=129 - V-Gear MyVCD 131 131 card=130 - Super TV Tuner 132 132 card=131 - Tibet Systems 'Progress DVR' CS16 133 133 card=132 - Kodicom 4400R (master) 134 134 card=133 - Kodicom 4400R (slave) 135 135 card=134 - Adlink RTV24 136 - card=135 - DVICO FusionHDTV 5 Lite 136 + card=135 - DViCO FusionHDTV 5 Lite 137 137 card=136 - Acorp Y878F
+2 -2
drivers/media/video/bttv-cards.c
··· 2258 2258 2259 2259 /* ---- card 0x80 ---------------------------------- */ 2260 2260 /* Chris Pascoe <c.pascoe@itee.uq.edu.au> */ 2261 - .name = "DVICO FusionHDTV DVB-T Lite", 2261 + .name = "DViCO FusionHDTV DVB-T Lite", 2262 2262 .tuner = -1, 2263 2263 .no_msp34xx = 1, 2264 2264 .no_tda9875 = 1, ··· 2389 2389 { 2390 2390 /* ---- card 0x87---------------------------------- */ 2391 2391 /* Michael Krufky <mkrufky@m1k.net> */ 2392 - .name = "DVICO FusionHDTV 5 Lite", 2392 + .name = "DViCO FusionHDTV 5 Lite", 2393 2393 .tuner = 0, 2394 2394 .tuner_type = TUNER_LG_TDVS_H062F, 2395 2395 .tuner_addr = ADDR_UNSET,
-6
drivers/media/video/cx88/cx88-dvb.c
··· 28 28 #include <linux/kthread.h> 29 29 #include <linux/file.h> 30 30 #include <linux/suspend.h> 31 - #include <linux/config.h> 32 31 33 32 34 33 #include "cx88.h" ··· 401 402 dev->dvb.frontend->ops->info.frequency_min = dev->core->pll_desc->min; 402 403 dev->dvb.frontend->ops->info.frequency_max = dev->core->pll_desc->max; 403 404 } 404 - 405 - /* Copy the board name into the DVB structure */ 406 - strlcpy(dev->dvb.frontend->ops->info.name, 407 - cx88_boards[dev->core->board].name, 408 - sizeof(dev->dvb.frontend->ops->info.name)); 409 405 410 406 /* register everything */ 411 407 return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
-6
drivers/media/video/saa7134/saa7134-cards.c
··· 2380 2380 .driver_data = SAA7134_BOARD_VIDEOMATE_TV_PVR, 2381 2381 },{ 2382 2382 .vendor = PCI_VENDOR_ID_PHILIPS, 2383 - .device = PCI_DEVICE_ID_PHILIPS_SAA7130, 2384 - .subvendor = 0x1131, 2385 - .subdevice = 0, 2386 - .driver_data = SAA7134_BOARD_SABRENT_SBTTVFM, 2387 - },{ 2388 - .vendor = PCI_VENDOR_ID_PHILIPS, 2389 2383 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 2390 2384 .subvendor = 0x1461, /* Avermedia Technologies Inc */ 2391 2385 .subdevice = 0x9715,