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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (7367): bug #10211: Fix depencencies for cx2341x
  V4L/DVB (7362): tvp5150.c: logical-bitwise and confusion
  V4L/DVB (7334): usb video: add a device link to usbvideo devices, else hal will ignore them
  V4L/DVB (7330): V4L1 - fix v4l_compat_translate_ioctl possible NULL deref
  V4L/DVB (7328): usb/opera1.c: fix a memory leak
  V4L/DVB (7291): em28xx: correct use of and fix
  V4L/DVB (7285): em28xx: Correct use of ! and &
  V4L/DVB (7279): ivtv: Add missing sg_init_table()
  V4L/DVB (7268): saa7134: fix: tuner should be loaded before calling saa7134_board_init2()
  V4L/DVB (7267): cx88: Fix: Loads tuner module before sending commands to it
  V4L/DVB (7251): VIDEO_VIVI must depend on VIDEO_DEV
  V4L/DVB (7242): ivtv: fix for yuv filter table check
  V4L/DVB (7236): bttv: struct member initialized twice
  V4L/DVB (7228): saa7134: fix FM radio support for the Pinnacle PCTV 110i
parents aedb60a6 eee4470f

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

+1 −1
Original line number Diff line number Diff line
@@ -478,9 +478,9 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev, 
				err("could not restart the USB controller CPU.");

				ret = -EINVAL;

			}

			kfree(p);

		}

	}

	kfree(p);

	if (fw) {

		release_firmware(fw);

	}

drivers/media/video/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ comment "MPEG video encoders" 


config VIDEO_CX2341X

	tristate "Conexant CX2341x MPEG encoders"

	depends on VIDEO_V4L2 && EXPERIMENTAL

	depends on VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_COMMON

	---help---

	  Support for the Conexant CX23416 MPEG encoders

	  and CX23415 MPEG encoder/decoders.
@@ -382,7 +382,7 @@ endmenu # encoder / decoder chips 


config VIDEO_VIVI

	tristate "Virtual Video Driver"

	depends on VIDEO_V4L2 && !SPARC32 && !SPARC64

	depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64

	select VIDEOBUF_VMALLOC

	default n

	---help---

drivers/media/video/bt8xx/bttv-driver.c

+0 −1
Original line number Diff line number Diff line
@@ -3388,7 +3388,6 @@ static struct video_device bttv_video_template = 
#ifdef CONFIG_VIDEO_V4L1_COMPAT

	.vidiocgmbuf                    = vidiocgmbuf,

#endif

	.vidioc_g_crop                  = bttv_g_crop,

	.vidioc_g_crop                  = bttv_g_crop,

	.vidioc_s_crop                  = bttv_s_crop,

	.vidioc_g_fbuf                  = bttv_g_fbuf,

drivers/media/video/cx88/cx88-cards.c

+5 −0
Original line number Diff line number Diff line
@@ -2196,6 +2196,11 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr) 
	cx88_reset(core);

	cx88_card_setup_pre_i2c(core);

	cx88_i2c_init(core, pci);



	/* load tuner module, if needed */

	if (TUNER_ABSENT != core->board.tuner_type)

		request_module("tuner");



	cx88_call_i2c_clients (core, TUNER_SET_STANDBY, NULL);

	cx88_card_setup(core);

	cx88_ir_init(core, pci);

drivers/media/video/cx88/cx88-video.c

+0 −2
Original line number Diff line number Diff line
@@ -1826,8 +1826,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, 
	cx_set(MO_PCI_INTMSK, core->pci_irqmask);



	/* load and configure helper modules */

	if (TUNER_ABSENT != core->board.tuner_type)

		request_module("tuner");



	if (core->board.audio_chip == AUDIO_CHIP_WM8775)

		request_module("wm8775");