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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB: bttv: Move I2C IR initialization
V4L/DVB: Video : pwc : Fix regression in pwc_set_shutter_speed caused by bad constant => sizeof conversion.
soc-camera: mt9t112: modify exiting conditions from standby mode
V4L/DVB: cxusb: Select all required frontend and tuner modules
V4L/DVB: dvb: l64781.ko broken with gcc 4.5

+15 -7
+3 -1
drivers/media/dvb/dvb-usb/Kconfig
··· 112 112 select DVB_MT352 if !DVB_FE_CUSTOMISE 113 113 select DVB_ZL10353 if !DVB_FE_CUSTOMISE 114 114 select DVB_DIB7000P if !DVB_FE_CUSTOMISE 115 - select DVB_LGS8GL5 if !DVB_FE_CUSTOMISE 116 115 select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE 116 + select DVB_ATBM8830 if !DVB_FE_CUSTOMISE 117 + select DVB_LGS8GXX if !DVB_FE_CUSTOMISE 117 118 select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMISE 118 119 select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE 119 120 select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE 121 + select MEDIA_TUNER_MAX2165 if !MEDIA_TUNER_CUSTOMISE 120 122 help 121 123 Say Y here to support the Conexant USB2.0 hybrid reference design. 122 124 Currently, only DVB and ATSC modes are supported, analog mode
+2 -2
drivers/media/dvb/frontends/l64781.c
··· 192 192 spi_bias *= qam_tab[p->constellation]; 193 193 spi_bias /= p->code_rate_HP + 1; 194 194 spi_bias /= (guard_tab[p->guard_interval] + 32); 195 - spi_bias *= 1000ULL; 196 - spi_bias /= 1000ULL + ppm/1000; 195 + spi_bias *= 1000; 196 + spi_bias /= 1000 + ppm/1000; 197 197 spi_bias *= p->code_rate_HP; 198 198 199 199 val0x04 = (p->transmission_mode << 2) | p->guard_interval;
+1
drivers/media/video/bt8xx/bttv-driver.c
··· 4461 4461 request_modules(btv); 4462 4462 } 4463 4463 4464 + init_bttv_i2c_ir(btv); 4464 4465 bttv_input_init(btv); 4465 4466 4466 4467 /* everything is fine */
+6 -2
drivers/media/video/bt8xx/bttv-i2c.c
··· 388 388 if (0 == btv->i2c_rc && i2c_scan) 389 389 do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client); 390 390 391 - /* Instantiate the IR receiver device, if present */ 391 + return btv->i2c_rc; 392 + } 393 + 394 + /* Instantiate the I2C IR receiver device, if present */ 395 + void __devinit init_bttv_i2c_ir(struct bttv *btv) 396 + { 392 397 if (0 == btv->i2c_rc) { 393 398 struct i2c_board_info info; 394 399 /* The external IR receiver is at i2c address 0x34 (0x35 for ··· 413 408 strlcpy(info.type, "ir_video", I2C_NAME_SIZE); 414 409 i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list); 415 410 } 416 - return btv->i2c_rc; 417 411 } 418 412 419 413 int __devexit fini_bttv_i2c(struct bttv *btv)
+1
drivers/media/video/bt8xx/bttvp.h
··· 279 279 extern unsigned int bttv_gpio; 280 280 extern void bttv_gpio_tracking(struct bttv *btv, char *comment); 281 281 extern int init_bttv_i2c(struct bttv *btv); 282 + extern void init_bttv_i2c_ir(struct bttv *btv); 282 283 extern int fini_bttv_i2c(struct bttv *btv); 283 284 284 285 #define bttv_printk if (bttv_verbose) printk
+1 -1
drivers/media/video/mt9t112.c
··· 514 514 /* poll to verify out of standby. Must Poll this bit */ 515 515 for (i = 0; i < 100; i++) { 516 516 mt9t112_reg_read(data, client, 0x0018); 517 - if (0x4000 & data) 517 + if (!(0x4000 & data)) 518 518 break; 519 519 520 520 mdelay(10);
+1 -1
drivers/media/video/pwc/pwc-ctrl.c
··· 753 753 buf[0] = 0xff; /* fixed */ 754 754 755 755 ret = send_control_msg(pdev, 756 - SET_LUM_CTL, SHUTTER_MODE_FORMATTER, &buf, sizeof(buf)); 756 + SET_LUM_CTL, SHUTTER_MODE_FORMATTER, &buf, 1); 757 757 758 758 if (!mode && ret >= 0) { 759 759 if (value < 0)