Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed75ded7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (4750): AGC command1/2 is board specific
  V4L/DVB (4748): Fixed oops for Nova-T USB2
  V4L/DVB (4746): HM12 is YUV 4:2:0, not YUV 4:1:1
  V4L/DVB (4744): The Samsung TCPN2121P30A does not have a tda9887
  V4L/DVB (4743): Fix oops in VIDIOC_G_PARM
  V4L/DVB (4742): Drivers/media/video: handle sysfs errors
  V4L/DVB (4741): {ov511,stv680}: handle sysfs errors
  V4L/DVB (4740): Fixed an if-block to avoid floating with debug-messages
  V4L/DVB (4739): SECAM support for saa7113 into saa7115
  V4L/DVB (4738): Bt8xx/dvb-bt8xx.c: check kmalloc() return value.
  V4L/DVB (4734): Tda826x: fix frontend selection for dvb_attach
  V4L/DVB (4733): Tda10086: fix frontend selection for dvb_attach
  V4L/DVB (4732): Fix spelling error in Kconfig help text for DVB_CORE_ATTACH
  V4L/DVB (4731a): Kconfig: restore pvrusb2 menu items
  V4L/DVB (4729): Fix VIDIOC_G_FMT for NTSC in cx25840.
  V4L/DVB (4727): Support status readout for saa713x based FM radio
  V4L/DVB (4725): Fix vivi compile on parisc
  V4L/DVB (4692): Add WinTV-HVR3000 DVB-T support
parents e5a301ee 5570dd02

Documentation/video4linux/CARDLIST.cx88

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
 50 -> NPG Tech Real TV FM Top 10                          [14f1:0842]

 51 -> WinFast DTV2000 H                                   [107d:665e]

 52 -> Geniatech DVB-S                                     [14f1:0084]

 53 -> Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DVB-T  [0070:1404]

 53 -> Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DVB-T  [0070:1404,0070:1400,0070:1401,0070:1402]

 54 -> Norwood Micro TV Tuner

 55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM  [c180:c980]

 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder   [0070:9600,0070:9601,0070:9602]

drivers/media/dvb/bt8xx/dvb-bt8xx.c

+4 −0
Original line number Diff line number Diff line
@@ -665,6 +665,10 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) 
	case BTTV_BOARD_TWINHAN_DST:

		/*	DST is not a frontend driver !!!		*/

		state = (struct dst_state *) kmalloc(sizeof (struct dst_state), GFP_KERNEL);

		if (!state) {

			printk("dvb_bt8xx: No memory\n");

			break;

		}

		/*	Setup the Card					*/

		state->config = &dst_config;

		state->i2c = card->i2c_adapter;

drivers/media/dvb/dvb-core/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ config DVB_CORE_ATTACH 
	  allow the card drivers to only load the frontend modules

	  they require. This saves several KBytes of memory.



	  Note: You will need moudule-init-tools v3.2 or later for this feature.

	  Note: You will need module-init-tools v3.2 or later for this feature.



	  If unsure say Y.

drivers/media/dvb/dvb-usb/dibusb-common.c

+9 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ EXPORT_SYMBOL(dibusb_read_eeprom_byte); 
// Config Adjacent channels  Perf -cal22

static struct dibx000_agc_config dib3000p_mt2060_agc_config = {

	.band_caps = BAND_VHF | BAND_UHF,

	.setup     = (0 << 15) | (0 << 14) | (1 << 13) | (1 << 12) | (29 << 0),

	.setup     = (1 << 8) | (5 << 5) | (1 << 4) | (1 << 3) | (0 << 2) | (2 << 0),



	.agc1_max = 48497,

	.agc1_min = 23593,
@@ -196,10 +196,14 @@ static struct dib3000mc_config stk3000p_dib3000p_config = { 
	.ln_adc_level = 0x1cc7,



	.output_mpeg2_in_188_bytes = 1,



	.agc_command1 = 1,

	.agc_command2 = 1,

};



static struct dibx000_agc_config dib3000p_panasonic_agc_config = {

	.setup    = (0 << 15) | (0 << 14) | (1 << 13) | (1 << 12) | (29 << 0),

	.band_caps = BAND_VHF | BAND_UHF,

	.setup     = (1 << 8) | (5 << 5) | (1 << 4) | (1 << 3) | (0 << 2) | (2 << 0),



	.agc1_max = 56361,

	.agc1_min = 22282,
@@ -226,6 +230,9 @@ static struct dib3000mc_config mod3000p_dib3000p_config = { 
	.ln_adc_level = 0x1cc7,



	.output_mpeg2_in_188_bytes = 1,



	.agc_command1 = 1,

	.agc_command2 = 1,

};



int dibusb_dib3000mc_frontend_attach(struct dvb_usb_adapter *adap)

drivers/media/dvb/dvb-usb/dibusb.h

+2 −0
Original line number Diff line number Diff line
@@ -99,7 +99,9 @@ 
struct dibusb_state {

	struct dib_fe_xfer_ops ops;

	int mt2060_present;

};



struct dibusb_device_state {

	/* for RC5 remote control */

	int old_toggle;

	int last_repeat_count;