commit c20137fc5329eaf24093fc48c52608dc66be8e5c · tjh.dev/kernel

+1 -1

MAINTAINERS

··· 4529 4529 USB VIDEO CLASS 4530 4530 P: Laurent Pinchart 4531 4531 M: laurent.pinchart@skynet.be 4532 - L: linux-uvc-devel@lists.berlios.de 4532 + L: linux-uvc-devel@lists.berlios.de (subscribers-only) 4533 4533 L: video4linux-list@redhat.com 4534 4534 W: http://linux-uvc.berlios.de 4535 4535 S: Maintained

+1 -1

drivers/media/dvb/b2c2/Kconfig

··· 9 9 select DVB_STV0297 if !DVB_FE_CUSTOMISE 10 10 select DVB_BCM3510 if !DVB_FE_CUSTOMISE 11 11 select DVB_LGDT330X if !DVB_FE_CUSTOMISE 12 - select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE 13 12 select DVB_S5H1420 if !DVB_FE_CUSTOMISE 14 13 select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE 15 14 select DVB_ISL6421 if !DVB_FE_CUSTOMISE 16 15 select DVB_CX24123 if !DVB_FE_CUSTOMISE 16 + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE 17 17 help 18 18 Support for the digital TV receiver chip made by B2C2 Inc. included in 19 19 Technisats PCI cards and USB boxes.

+2

drivers/media/dvb/b2c2/flexcop-fe-tuner.c

··· 628 628 } 629 629 630 630 /* try the cable dvb (stv0297) */ 631 + fc->fc_i2c_adap[0].no_base_addr = 1; 631 632 fc->fe = dvb_attach(stv0297_attach, &alps_tdee4_stv0297_config, i2c); 632 633 if (fc->fe != NULL) { 633 634 fc->dev_type = FC_CABLE; 634 635 fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params; 635 636 goto fe_found; 636 637 } 638 + fc->fc_i2c_adap[0].no_base_addr = 0; 637 639 638 640 /* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */ 639 641 fc->fe = dvb_attach(mt312_attach,

+5 -1

drivers/media/dvb/b2c2/flexcop-i2c.c

··· 47 47 int len = r100.tw_sm_c_100.total_bytes, /* remember total_bytes is buflen-1 */ 48 48 ret; 49 49 50 - r100.tw_sm_c_100.no_base_addr_ack_error = i2c->no_base_addr; 51 50 ret = flexcop_i2c_operation(i2c->fc, &r100); 51 + if (ret != 0) { 52 + deb_i2c("Retrying operation\n"); 53 + r100.tw_sm_c_100.no_base_addr_ack_error = i2c->no_base_addr; 54 + ret = flexcop_i2c_operation(i2c->fc, &r100); 55 + } 52 56 if (ret != 0) { 53 57 deb_i2c("read failed. %d\n", ret); 54 58 return ret;

+1 -1

drivers/media/dvb/bt8xx/Kconfig

··· 8 8 select DVB_OR51211 if !DVB_FE_CUSTOMISE 9 9 select DVB_LGDT330X if !DVB_FE_CUSTOMISE 10 10 select DVB_ZL10353 if !DVB_FE_CUSTOMISE 11 - select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE 11 + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE 12 12 help 13 13 Support for PCI cards based on the Bt8xx PCI bridge. Examples are 14 14 the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,

+23 -23

drivers/media/dvb/dvb-usb/Kconfig

··· 24 24 tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)" 25 25 depends on DVB_USB 26 26 select DVB_DIB3000MC 27 - select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE 28 27 select DVB_PLL if !DVB_FE_CUSTOMISE 28 + select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE 29 29 help 30 30 Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver. 31 31 ··· 34 34 depends on DVB_USB 35 35 select DVB_PLL if !DVB_FE_CUSTOMISE 36 36 select DVB_DIB3000MB 37 - select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE 37 + select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE 38 38 help 39 39 Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by 40 40 DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator. ··· 55 55 tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)" 56 56 depends on DVB_USB 57 57 select DVB_DIB3000MC 58 - select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE 58 + select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE 59 59 help 60 60 Support for USB2.0 DVB-T receivers based on reference designs made by 61 61 DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator. ··· 73 73 select DVB_DIB7000M 74 74 select DVB_DIB3000MC 75 75 select DVB_S5H1411 if !DVB_FE_CUSTOMISE 76 - select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE 77 - select MEDIA_TUNER_MT2266 if !DVB_FE_CUSTOMISE 78 - select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE 79 - select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE 80 76 select DVB_TUNER_DIB0070 77 + select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE 78 + select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMIZE 79 + select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE 80 + select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE 81 81 help 82 82 Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The 83 83 USB bridge is also present in devices having the DiB7700 DVB-T-USB ··· 95 95 depends on DVB_USB 96 96 select DVB_PLL if !DVB_FE_CUSTOMISE 97 97 select DVB_DIB3000MC 98 - select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE 98 + select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE 99 99 help 100 100 Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver. 101 101 ··· 107 107 select DVB_LGDT330X if !DVB_FE_CUSTOMISE 108 108 select DVB_MT352 if !DVB_FE_CUSTOMISE 109 109 select DVB_ZL10353 if !DVB_FE_CUSTOMISE 110 - select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE 111 - select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE 112 - select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE 113 110 select DVB_DIB7000P if !DVB_FE_CUSTOMISE 114 111 select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE 112 + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE 113 + select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE 114 + select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE 115 115 help 116 116 Say Y here to support the Conexant USB2.0 hybrid reference design. 117 117 Currently, only DVB and ATSC modes are supported, analog mode ··· 124 124 tristate "Uli m920x DVB-T USB2.0 support" 125 125 depends on DVB_USB 126 126 select DVB_MT352 if !DVB_FE_CUSTOMISE 127 - select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE 128 - select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE 129 127 select DVB_TDA1004X if !DVB_FE_CUSTOMISE 128 + select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE 129 + select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE 130 130 help 131 131 Say Y here to support the MSI Mega Sky 580 USB2.0 DVB-T receiver. 132 132 Currently, only devices with a product id of ··· 137 137 tristate "Genesys Logic GL861 USB2.0 support" 138 138 depends on DVB_USB 139 139 select DVB_ZL10353 if !DVB_FE_CUSTOMISE 140 - select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE 140 + select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE 141 141 help 142 142 Say Y here to support the MSI Megasky 580 (55801) DVB-T USB2.0 143 143 receiver with USB ID 0db0:5581. ··· 146 146 tristate "Alcor Micro AU6610 USB2.0 support" 147 147 depends on DVB_USB 148 148 select DVB_ZL10353 if !DVB_FE_CUSTOMISE 149 - select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE 149 + select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE 150 150 help 151 151 Say Y here to support the Sigmatek DVB-110 DVB-T USB2.0 receiver. 152 152 ··· 198 198 tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support" 199 199 depends on DVB_USB 200 200 select DVB_DIB3000MC 201 - select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE 202 201 select DVB_PLL if !DVB_FE_CUSTOMISE 202 + select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE 203 203 help 204 204 Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver. 205 205 ··· 235 235 config DVB_USB_AF9005 236 236 tristate "Afatech AF9005 DVB-T USB1.1 support" 237 237 depends on DVB_USB && EXPERIMENTAL 238 - select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE 239 - select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE 238 + select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE 239 + select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE 240 240 help 241 241 Say Y here to support the Afatech AF9005 based DVB-T USB1.1 receiver 242 242 and the TerraTec Cinergy T USB XE (Rev.1) ··· 284 284 tristate "AME DTV-5100 USB2.0 DVB-T support" 285 285 depends on DVB_USB 286 286 select DVB_ZL10353 if !DVB_FE_CUSTOMISE 287 - select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE 287 + select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE 288 288 help 289 289 Say Y here to support the AME DTV-5100 USB2.0 DVB-T receiver. 290 290 ··· 293 293 depends on DVB_USB && EXPERIMENTAL 294 294 select DVB_AF9013 295 295 select DVB_PLL if !DVB_FE_CUSTOMISE 296 - select MEDIA_TUNER_MT2060 if !DVB_FE_CUSTOMISE 297 - select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE 298 - select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMISE 299 - select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE 296 + select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMIZE 297 + select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMIZE 298 + select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE 299 + select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE 300 300 help 301 301 Say Y here to support the Afatech AF9015 based DVB-T USB2.0 receiver

+3 -3

drivers/media/dvb/dvb-usb/dib0700_devices.c

··· 446 446 == NULL ? -ENODEV : 0; 447 447 } 448 448 449 - #define DEFAULT_RC_INTERVAL 150 449 + #define DEFAULT_RC_INTERVAL 50 450 450 451 451 static u8 rc_request[] = { REQUEST_POLL_RC, 0 }; 452 452 453 453 /* Number of keypresses to ignore before start repeating */ 454 - #define RC_REPEAT_DELAY 2 455 - #define RC_REPEAT_DELAY_V1_20 5 454 + #define RC_REPEAT_DELAY 6 455 + #define RC_REPEAT_DELAY_V1_20 10 456 456 457 457 458 458

+1 -1

drivers/media/dvb/ttpci/Kconfig

··· 106 106 select DVB_TDA1004X if !DVB_FE_CUSTOMISE 107 107 select DVB_LNBP21 if !DVB_FE_CUSTOMISE 108 108 select DVB_TDA10023 if !DVB_FE_CUSTOMISE 109 - select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE 109 + select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE 110 110 select VIDEO_IR 111 111 help 112 112 Support for simple SAA7146 based DVB cards

+1 -1

drivers/media/video/compat_ioctl32.c

··· 831 831 { 832 832 int ret = -ENOIOCTLCMD; 833 833 834 - if (!file->f_op->ioctl) 834 + if (!file->f_op->ioctl && !file->f_op->unlocked_ioctl) 835 835 return ret; 836 836 837 837 switch (cmd) {

+1 -1

drivers/media/video/cx18/Kconfig

··· 9 9 select VIDEO_CX2341X 10 10 select VIDEO_CS5345 11 11 select DVB_S5H1409 if !DVB_FE_CUSTOMISE 12 - select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE 12 + select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE 13 13 ---help--- 14 14 This is a video4linux driver for Conexant cx23418 based 15 15 PCI combo video recorder devices.

+2 -2

drivers/media/video/cx23885/Kconfig

··· 11 11 select VIDEO_CX25840 12 12 select VIDEO_CX2341X 13 13 select DVB_DIB7000P if !DVB_FE_CUSTOMISE 14 - select MEDIA_TUNER_MT2131 if !DVB_FE_CUSTOMISE 15 14 select DVB_S5H1409 if !DVB_FE_CUSTOMISE 16 15 select DVB_S5H1411 if !DVB_FE_CUSTOMISE 17 16 select DVB_LGDT330X if !DVB_FE_CUSTOMISE 18 17 select DVB_ZL10353 if !DVB_FE_CUSTOMISE 18 + select DVB_TDA10048 if !DVB_FE_CUSTOMIZE 19 + select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE 19 20 select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE 20 21 select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE 21 22 select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE 22 23 select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE 23 - select DVB_TDA10048 if !DVB_FE_CUSTOMIZE 24 24 ---help--- 25 25 This is a video4linux driver for Conexant 23885 based 26 26 TV cards.

+1 -1

drivers/media/video/cx88/Kconfig

··· 56 56 select DVB_NXT200X if !DVB_FE_CUSTOMISE 57 57 select DVB_CX24123 if !DVB_FE_CUSTOMISE 58 58 select DVB_ISL6421 if !DVB_FE_CUSTOMISE 59 - select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE 60 59 select DVB_S5H1411 if !DVB_FE_CUSTOMISE 61 60 select DVB_CX24116 if !DVB_FE_CUSTOMISE 62 61 select DVB_STV0299 if !DVB_FE_CUSTOMISE 63 62 select DVB_STV0288 if !DVB_FE_CUSTOMISE 64 63 select DVB_STB6000 if !DVB_FE_CUSTOMISE 64 + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE 65 65 ---help--- 66 66 This adds support for DVB/ATSC cards based on the 67 67 Conexant 2388x chip.

+2 -1

drivers/media/video/em28xx/em28xx-video.c

··· 549 549 static void em28xx_config_i2c(struct em28xx *dev) 550 550 { 551 551 struct v4l2_routing route; 552 + int zero = 0; 552 553 553 554 route.input = INPUT(dev->ctl_input)->vmux; 554 555 route.output = 0; 555 - em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, NULL); 556 + em28xx_i2c_call_clients(dev, VIDIOC_INT_RESET, &zero); 556 557 em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route); 557 558 em28xx_i2c_call_clients(dev, VIDIOC_STREAMON, NULL); 558 559 }

+2 -2

drivers/media/video/gspca/gspca.c

··· 1264 1264 struct gspca_dev *gspca_dev = priv; 1265 1265 int ret; 1266 1266 1267 - if (mutex_lock_interruptible(&gspca_dev->usb_lock)) 1268 - return -ERESTARTSYS; 1269 1267 if (!gspca_dev->sd_desc->set_jcomp) 1270 1268 return -EINVAL; 1269 + if (mutex_lock_interruptible(&gspca_dev->usb_lock)) 1270 + return -ERESTARTSYS; 1271 1271 ret = gspca_dev->sd_desc->set_jcomp(gspca_dev, jpegcomp); 1272 1272 mutex_unlock(&gspca_dev->usb_lock); 1273 1273 return ret;

+1 -1

drivers/media/video/pvrusb2/Kconfig

··· 42 42 select DVB_S5H1411 if !DVB_FE_CUSTOMISE 43 43 select DVB_TDA10048 if !DVB_FE_CUSTOMIZE 44 44 select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE 45 - select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE 45 + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE 46 46 select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE 47 47 ---help--- 48 48

+2 -2

drivers/media/video/saa7134/Kconfig

··· 34 34 select DVB_NXT200X if !DVB_FE_CUSTOMISE 35 35 select DVB_TDA10086 if !DVB_FE_CUSTOMISE 36 36 select DVB_TDA826X if !DVB_FE_CUSTOMISE 37 - select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE 38 37 select DVB_ISL6421 if !DVB_FE_CUSTOMISE 39 - select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE 38 + select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE 39 + select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE 40 40 ---help--- 41 41 This adds support for DVB cards based on the 42 42 Philips saa7134 chip.