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

Commit b80b601f 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/v4l-dvb 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (23 commits)
  V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers.
  V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams
  V4L/DVB (8611): Add suspend/resume to pxa_camera driver
  V4L/DVB (8610): Add suspend/resume capabilities to soc_camera.
  V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity.
  V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4
  V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1
  V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash.
  V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519.
  V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro
  V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x.
  V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508.
  V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation.
  V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option.
  V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source.
  V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup.
  V4L/DVB (8564): fix vino driver build error
  V4L/DVB (8563): fix drivers/media/video/arv.c compilation
  V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select
  V4L/DVB (8558): media/video/Kconfig: fix a typo
  ...
parents a06dee41 04793dd0

Documentation/video4linux/gspca.txt

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ sonixj 0c45:6130 Sonix Pccam 
sonixj		0c45:6138	Sn9c120 Mo4000

sonixj		0c45:613b	Surfer SN-206

sonixj		0c45:613c	Sonix Pccam168

sonixj		0c45:6143	Sonix Pccam168

sunplus		0d64:0303	Sunplus FashionCam DXG

etoms		102c:6151	Qcam Sangha CIF

etoms		102c:6251	Qcam xxxxxx VGA

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

+4 −3
Original line number Diff line number Diff line
@@ -565,7 +565,8 @@ static int cxusb_lgh064f_tuner_attach(struct dvb_usb_adapter *adap) 


static int dvico_bluebird_xc2028_callback(void *ptr, int command, int arg)

{

	struct dvb_usb_device *d = ptr;

	struct dvb_usb_adapter *adap = ptr;

	struct dvb_usb_device *d = adap->dev;



	switch (command) {

	case XC2028_TUNER_RESET:
@@ -593,9 +594,9 @@ static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap) 
		.callback  = dvico_bluebird_xc2028_callback,

	};

	static struct xc2028_ctrl ctl = {

		.fname       = "xc3028-dvico-au-01.fw",

		.fname       = "xc3028-v27.fw",

		.max_len     = 64,

		.scode_table = XC3028_FE_ZARLINK456,

		.demod       = XC3028_FE_ZARLINK456,

	};



	fe = dvb_attach(xc2028_attach, adap->fe, &cfg);

drivers/media/dvb/frontends/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -135,9 +135,8 @@ config DVB_CX22702 


config DVB_DRX397XD

	tristate "Micronas DRX3975D/DRX3977D based"

	depends on DVB_CORE && I2C && HOTPLUG

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	select FW_LOADER

	help

	  A DVB-T tuner module. Say Y when you want to support this frontend.

drivers/media/video/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ config VIDEO_ZORAN_ZR36060 
	depends on VIDEO_ZORAN

	help

	  Say Y to support Zoran boards based on 36060 chips.

	  This includes Iomega Bus, Pinnacle DC10, Linux media Labs 33

	  This includes Iomega Buz, Pinnacle DC10, Linux media Labs 33

	  and 33 R10 and AverMedia 6 boards.



config VIDEO_ZORAN_BUZ

drivers/media/video/arv.c

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/sched.h>

#include <linux/videodev.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ioctl.h>

#include <linux/mutex.h>



#include <asm/uaccess.h>
@@ -755,7 +756,6 @@ static const struct file_operations ar_fops = { 


static struct video_device ar_template = {

	.name		= "Colour AR VGA",

	.type		= VID_TYPE_CAPTURE,

	.fops		= &ar_fops,

	.release	= ar_release,

	.minor		= -1,