Commit c20137fc 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:
  V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to VIDIOC_INT_RESET command
  V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only
  V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
  V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
  V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
  V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2 support)
  V4L/DVB (9780): dib0700: Stop repeating after user stops pushing button
parents 1806f826 231ffc9c

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4529,7 +4529,7 @@ S: Maintained 
USB VIDEO CLASS

P:	Laurent Pinchart

M:	laurent.pinchart@skynet.be

L:	linux-uvc-devel@lists.berlios.de

L:	linux-uvc-devel@lists.berlios.de (subscribers-only)

L:	video4linux-list@redhat.com

W:	http://linux-uvc.berlios.de

S:	Maintained

drivers/media/dvb/b2c2/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ config DVB_B2C2_FLEXCOP 
	select DVB_STV0297 if !DVB_FE_CUSTOMISE

	select DVB_BCM3510 if !DVB_FE_CUSTOMISE

	select DVB_LGDT330X if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE

	select DVB_S5H1420 if !DVB_FE_CUSTOMISE

	select DVB_TUNER_ITD1000 if !DVB_FE_CUSTOMISE

	select DVB_ISL6421 if !DVB_FE_CUSTOMISE

	select DVB_CX24123 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE

	help

	  Support for the digital TV receiver chip made by B2C2 Inc. included in

	  Technisats PCI cards and USB boxes.

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

+2 −0
Original line number Diff line number Diff line
@@ -628,12 +628,14 @@ int flexcop_frontend_init(struct flexcop_device *fc) 
	}



	/* try the cable dvb (stv0297) */

	fc->fc_i2c_adap[0].no_base_addr = 1;

	fc->fe = dvb_attach(stv0297_attach, &alps_tdee4_stv0297_config, i2c);

	if (fc->fe != NULL) {

		fc->dev_type = FC_CABLE;

		fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params;

		goto fe_found;

	}

	fc->fc_i2c_adap[0].no_base_addr = 0;



	/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */

	fc->fe = dvb_attach(mt312_attach,

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

+5 −1
Original line number Diff line number Diff line
@@ -47,8 +47,12 @@ static int flexcop_i2c_read4(struct flexcop_i2c_adapter *i2c, 
	int len = r100.tw_sm_c_100.total_bytes, /* remember total_bytes is buflen-1 */

		ret;



	ret = flexcop_i2c_operation(i2c->fc, &r100);

	if (ret != 0) {

		deb_i2c("Retrying operation\n");

		r100.tw_sm_c_100.no_base_addr_ack_error = i2c->no_base_addr;

		ret = flexcop_i2c_operation(i2c->fc, &r100);

	}

	if (ret != 0) {

		deb_i2c("read failed. %d\n", ret);

		return ret;

drivers/media/dvb/bt8xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config DVB_BT8XX 
	select DVB_OR51211 if !DVB_FE_CUSTOMISE

	select DVB_LGDT330X if !DVB_FE_CUSTOMISE

	select DVB_ZL10353 if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE

	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE

	help

	  Support for PCI cards based on the Bt8xx PCI bridge. Examples are

	  the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards,

CRA Git | Maintained and supported by SUSTech CRA and CCSE