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

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

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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (27 commits)
  V4L/DVB (13314): saa7134: set ts_force_val for the Hauppauge WinTV HVR-1150
  V4L/DVB (13313): saa7134: add support for FORCE_TS_VALID mode for mpeg ts input
  V4L/DVB (13311): uvcvideo: Fix compilation warning with 2.6.32 due to type mismatch with abs()
  V4L/DVB (13309): uvcvideo: Ignore the FIX_BANDWIDTH for compressed video
  V4L/DVB (13287): ce6230 - saa7164-cmd: Fix wrong sizeof
  V4L/DVB (13286): pxa-camera: Fix missing sched.h
  V4L/DVB (13264): gspca_mr97310a: Change vstart for CIF sensor type 1 cams
  V4L/DVB (13257): gspca - m5602-s5k4aa: Add vflip for Fujitsu Amilo Xi 2528
  V4L/DVB (13256): gspca - m5602-s5k4aa: Add another MSI GX700 vflip quirk
  V4L/DVB (13255): gspca - m5602-s5k4aa: Add vflip quirk for the Bruneinit laptop
  V4L/DVB (13240): firedtv: fix regression: tuning fails due to bogus error return
  V4L/DVB (13237): firedtv: length field corrupt in ca2host if length>127
  V4L/DVB (13230): s2255drv: Don't conditionalize video buffer completion on waiting processes
  V4L/DVB (13202): smsusb: add autodetection support for three additional Hauppauge USB IDs
  V4L/DVB (13190): em28xx: fix panic that can occur when starting audio streaming
  V4L/DVB (13170): bttv: Fix reversed polarity error when switching video standard
  V4L/DVB (13169): bttv: Fix potential out-of-order field processing
  V4L/DVB (13167): pt1: Fix a compile error on arm
  V4L/DVB (13132): fix use-after-free Oops, resulting from a driver-core API change
  V4L/DVB (13131): pxa_camera: fix camera pixel format configuration
  ...
parents 52cb0148 22370ef5

drivers/media/common/tuners/tda18271-fe.c

+4 −4
Original line number Diff line number Diff line
@@ -616,13 +616,13 @@ static int tda18271_rf_tracking_filters_init(struct dvb_frontend *fe, u32 freq) 
		case RF2:

			map[i].rf_a1 = (prog_cal[RF2] - prog_tab[RF2] -

					prog_cal[RF1] + prog_tab[RF1]) /

				((rf_freq[RF2] - rf_freq[RF1]) / 1000);

				(s32)((rf_freq[RF2] - rf_freq[RF1]) / 1000);

			map[i].rf2   = rf_freq[RF2] / 1000;

			break;

		case RF3:

			map[i].rf_a2 = (prog_cal[RF3] - prog_tab[RF3] -

					prog_cal[RF2] + prog_tab[RF2]) /

				((rf_freq[RF3] - rf_freq[RF2]) / 1000);

				(s32)((rf_freq[RF3] - rf_freq[RF2]) / 1000);

			map[i].rf_b2 = prog_cal[RF2] - prog_tab[RF2];

			map[i].rf3   = rf_freq[RF3] / 1000;

			break;
@@ -1000,12 +1000,12 @@ static int tda18271_set_analog_params(struct dvb_frontend *fe, 
	struct tda18271_std_map_item *map;

	char *mode;

	int ret;

	u32 freq = params->frequency * 62500;

	u32 freq = params->frequency * 125 *

		((params->mode == V4L2_TUNER_RADIO) ? 1 : 1000) / 2;



	priv->mode = TDA18271_ANALOG;



	if (params->mode == V4L2_TUNER_RADIO) {

		freq = freq / 1000;

		map = &std_map->fm_radio;

		mode = "fm";

	} else if (params->std & V4L2_STD_MN) {

drivers/media/dvb/dvb-usb/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ config DVB_USB_DIB0700 
	select DVB_DIB3000MC if !DVB_FE_CUSTOMISE

	select DVB_S5H1411 if !DVB_FE_CUSTOMISE

	select DVB_LGDT3305 if !DVB_FE_CUSTOMISE

	select DVB_TUNER_DIB0070

	select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_MT2266 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMISE

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

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int ce6230_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], 
	int i = 0;

	struct req_t req;

	int ret = 0;

	memset(&req, 0, sizeof(&req));

	memset(&req, 0, sizeof(req));



	if (num > 2)

		return -EINVAL;

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

+6 −9
Original line number Diff line number Diff line
@@ -1925,7 +1925,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
				{ NULL },

			},

			{   "Leadtek Winfast DTV Dongle (STK7700P based)",

				{ &dib0700_usb_id_table[8] },

				{ &dib0700_usb_id_table[8], &dib0700_usb_id_table[34] },

				{ NULL },

			},

			{   "AVerMedia AVerTV DVB-T Express",
@@ -2064,7 +2064,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
			},

		},



		.num_device_descs = 12,

		.num_device_descs = 11,

		.devices = {

			{   "DiBcom STK7070P reference design",

				{ &dib0700_usb_id_table[15], NULL },
@@ -2098,11 +2098,6 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
				{ &dib0700_usb_id_table[30], NULL },

				{ NULL },

			},

			{   "Terratec Cinergy T USB XXS/ T3",

				{ &dib0700_usb_id_table[33],

					&dib0700_usb_id_table[52], NULL },

				{ NULL },

			},

			{   "Elgato EyeTV DTT",

				{ &dib0700_usb_id_table[49], NULL },

				{ NULL },
@@ -2343,8 +2338,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
				{ &dib0700_usb_id_table[59], NULL },

				{ NULL },

			},

			{   "Terratec Cinergy T USB XXS (HD)",

				{ &dib0700_usb_id_table[34], &dib0700_usb_id_table[60] },

			{   "Terratec Cinergy T USB XXS (HD)/ T3",

				{ &dib0700_usb_id_table[33],

					&dib0700_usb_id_table[52],

					&dib0700_usb_id_table[60], NULL},

				{ NULL },

			},

		},

drivers/media/dvb/firewire/firedtv-avc.c

+20 −18
Original line number Diff line number Diff line
@@ -1050,28 +1050,28 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length) 
	c->operand[4] = 0; /* slot */

	c->operand[5] = SFE_VENDOR_TAG_CA_PMT; /* ca tag */

	c->operand[6] = 0; /* more/last */

	/* c->operand[7] = XXXprogram_info_length + 17; */ /* length */

	c->operand[8] = list_management;

	c->operand[9] = 0x01; /* pmt_cmd=OK_descramble */

	/* Use three bytes for length field in case length > 127 */

	c->operand[10] = list_management;

	c->operand[11] = 0x01; /* pmt_cmd=OK_descramble */



	/* TS program map table */



	c->operand[10] = 0x02; /* Table id=2 */

	c->operand[11] = 0x80; /* Section syntax + length */

	/* c->operand[12] = XXXprogram_info_length + 12; */

	c->operand[13] = msg[1]; /* Program number */

	c->operand[14] = msg[2];

	c->operand[15] = 0x01; /* Version number=0 + current/next=1 */

	c->operand[16] = 0x00; /* Section number=0 */

	c->operand[17] = 0x00; /* Last section number=0 */

	c->operand[18] = 0x1f; /* PCR_PID=1FFF */

	c->operand[19] = 0xff;

	c->operand[20] = (program_info_length >> 8); /* Program info length */

	c->operand[21] = (program_info_length & 0xff);

	c->operand[12] = 0x02; /* Table id=2 */

	c->operand[13] = 0x80; /* Section syntax + length */

	/* c->operand[14] = XXXprogram_info_length + 12; */

	c->operand[15] = msg[1]; /* Program number */

	c->operand[16] = msg[2];

	c->operand[17] = 0x01; /* Version number=0 + current/next=1 */

	c->operand[18] = 0x00; /* Section number=0 */

	c->operand[19] = 0x00; /* Last section number=0 */

	c->operand[20] = 0x1f; /* PCR_PID=1FFF */

	c->operand[21] = 0xff;

	c->operand[22] = (program_info_length >> 8); /* Program info length */

	c->operand[23] = (program_info_length & 0xff);



	/* CA descriptors at programme level */

	read_pos = 6;

	write_pos = 22;

	write_pos = 24;

	if (program_info_length > 0) {

		pmt_cmd_id = msg[read_pos++];

		if (pmt_cmd_id != 1 && pmt_cmd_id != 4)
@@ -1113,8 +1113,10 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length) 
	c->operand[write_pos++] = 0x00;

	c->operand[write_pos++] = 0x00;



	c->operand[7] = write_pos - 8;

	c->operand[12] = write_pos - 13;

	c->operand[7] = 0x82;

	c->operand[8] = (write_pos - 10) >> 8;

	c->operand[9] = (write_pos - 10) & 0xff;

	c->operand[14] = write_pos - 15;



	crc32_csum = crc32_be(0, &c->operand[10], c->operand[12] - 1);

	c->operand[write_pos - 4] = (crc32_csum >> 24) & 0xff;