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

Commit 93acda84 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 (11652): au0828: fix kernel oops regression on USB disconnect.
  V4L/DVB (11626): cx23885: Two fixes for DViCO FusionHDTV DVB-T Dual Express
  V4L/DVB (11612): mx3_camera: Fix compilation with CONFIG_PM
  V4L/DVB (11570): patch: s2255drv: fix race condition on set mode
  V4L/DVB (11568): cx18: Fix the handling of i2c bus registration error
  V4L/DVB (11561a): move media after i2c
  V4L/DVB (11516): drivers/media/video/saa5246a.c: fix use-after-free
  V4L/DVB (11515): drivers/media/video/saa5249.c: fix use-after-free and leak
  V4L/DVB (11494a): cx231xx Kconfig fixes
  V4L/DVB (11494): cx18: Send correct input routing value to external audio multiplexers
parents 3dacbdad fe78a49c

drivers/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ obj-$(CONFIG_FB_INTEL) += video/intelfb/ 


obj-y				+= serial/

obj-$(CONFIG_PARPORT)		+= parport/

obj-y				+= base/ block/ misc/ mfd/ media/

obj-y				+= base/ block/ misc/ mfd/

obj-$(CONFIG_NUBUS)		+= nubus/

obj-y				+= macintosh/

obj-$(CONFIG_IDE)		+= ide/
@@ -71,7 +71,7 @@ obj-$(CONFIG_GAMEPORT) += input/gameport/ 
obj-$(CONFIG_INPUT)		+= input/

obj-$(CONFIG_I2O)		+= message/

obj-$(CONFIG_RTC_LIB)		+= rtc/

obj-y				+= i2c/

obj-y				+= i2c/ media/

obj-$(CONFIG_W1)		+= w1/

obj-$(CONFIG_POWER_SUPPLY)	+= power/

obj-$(CONFIG_HWMON)		+= hwmon/

drivers/media/video/au0828/au0828-core.c

+4 −2
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ static int au0828_usb_probe(struct usb_interface *interface, 
	dev->usbdev = usbdev;

	dev->boardnr = id->driver_info;



	usb_set_intfdata(interface, dev);



	/* Create the v4l2_device */

	retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);

	if (retval) {
@@ -222,6 +220,10 @@ static int au0828_usb_probe(struct usb_interface *interface, 
	/* Digital TV */

	au0828_dvb_register(dev);



	/* Store the pointer to the au0828_dev so it can be accessed in

	   au0828_usb_disconnect */

	usb_set_intfdata(interface, dev);



	printk(KERN_INFO "Registered device AU0828 [%s]\n",

		dev->board.name == NULL ? "Unset" : dev->board.name);

drivers/media/video/cx18/cx18-audio.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ int cx18_audio_set_io(struct cx18 *cx) 


	/* handle muxer chips */

	v4l2_subdev_call(cx->sd_extmux, audio, s_routing,

			in->audio_input, 0, 0);

			 (u32) in->muxer_input, 0, 0);



	err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl,

			       audio, s_routing, in->audio_input, 0, 0);

drivers/media/video/cx18/cx18-i2c.c

+13 −3
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static struct i2c_algo_bit_data cx18_i2c_algo_template = { 
/* init + register i2c algo-bit adapter */

int init_cx18_i2c(struct cx18 *cx)

{

	int i;

	int i, err;

	CX18_DEBUG_I2C("i2c init\n");



	for (i = 0; i < 2; i++) {
@@ -268,8 +268,18 @@ int init_cx18_i2c(struct cx18 *cx) 
	cx18_call_hw(cx, CX18_HW_GPIO_RESET_CTRL,

		     core, reset, (u32) CX18_GPIO_RESET_I2C);



	return i2c_bit_add_bus(&cx->i2c_adap[0]) ||

		i2c_bit_add_bus(&cx->i2c_adap[1]);

	err = i2c_bit_add_bus(&cx->i2c_adap[0]);

	if (err)

		goto err;

	err = i2c_bit_add_bus(&cx->i2c_adap[1]);

	if (err)

		goto err_del_bus_0;

	return 0;



 err_del_bus_0:

	i2c_del_adapter(&cx->i2c_adap[0]);

 err:

	return err;

}



void exit_cx18_i2c(struct cx18 *cx)

drivers/media/video/cx231xx/Kconfig

+22 −22
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ config VIDEO_CX231XX 
	select VIDEO_IR

	select VIDEOBUF_VMALLOC

	select VIDEO_CX25840

       select VIDEO_CX231XX_ALSA



	---help---

	  This is a video4linux driver for Conexant 231xx USB based TV cards.
@@ -30,6 +29,7 @@ config VIDEO_CX231XX_DVB 
	depends on VIDEO_CX231XX && DVB_CORE

	select VIDEOBUF_DVB

	select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE



	---help---

	  This adds support for DVB cards based on the

	  Conexant cx231xx chips.