Commit 97c440ba 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 (10191a): Update MAINTAINERS entries on media drivers
  V4L/DVB (10190): cx88: Fix some Kbuild troubles
  V4L/DVB (10189): dm1105: Fix build with INPUT=m and DVB_DM1105=y
  V4L/DVB (10185): Use negated usb_endpoint_xfer_control, etc
  V4L/DVB (10182): tda8290: fix TDA8290 + TDA18271 initialization
  V4L/DVB (10181): v4l2-device: Fix some sparse warnings
  V4L/DVB (10180): drivers/media: Fix a number of sparse warnings
  V4L/DVB (10179): tda8290: Fix two sparse warnings
  V4L/DVB (10178): dvb_frontend: Fix some sparse warnings due to static symbols
  V4L/DVB (10177): Fix sparse warnings on em28xx
  V4L/DVB (10176b): pxa-camera: fix redefinition warnings and missing DMA definitions
  V4L/DVB (10176a): Switch remaining clear_user_page users over to clear_user_highpage
parents 713404d6 661263b5

MAINTAINERS

+42 −23
Original line number Diff line number Diff line
@@ -1024,16 +1024,17 @@ S: Maintained 
BTTV VIDEO4LINUX DRIVER

P:	Mauro Carvalho Chehab

M:	mchehab@infradead.org

M:	v4l-dvb-maintainer@linuxtv.org

L:	linux-media@vger.kernel.org

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

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

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER

P:	Jonathan Corbet

M:	corbet@lwn.net

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



CALGARY x86-64 IOMMU
@@ -1261,7 +1262,8 @@ P: Hans Verkuil, Andy Walls 
M:	hverkuil@xs4all.nl, awalls@radix.net

L:	ivtv-devel@ivtvdriver.org

L:	ivtv-users@ivtvdriver.org

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://linuxtv.org

S:	Maintained
@@ -1487,10 +1489,10 @@ S: Maintained 


DVB SUBSYSTEM AND DRIVERS

P:	LinuxTV.org Project

M:	v4l-dvb-maintainer@linuxtv.org

M:	linux-media@vger.kernel.org

L:	linux-dvb@linuxtv.org (subscription required)

W:	http://linuxtv.org/

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

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



DZ DECSTATION DZ11 SERIAL DRIVER
@@ -1882,32 +1884,37 @@ S: Maintained 
GSPCA FINEPIX SUBDRIVER

P:	Frank Zago

M:	frank@zago.net

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



GSPCA M5602 SUBDRIVER

P:	Erik Andren

M:	erik.andren@gmail.com

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



GSPCA PAC207 SONIXB SUBDRIVER

P:	Hans de Goede

M:	hdegoede@redhat.com

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



GSPCA T613 SUBDRIVER

P:	Leandro Costantino

M:	lcostantino@gmail.com

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



GSPCA USB WEBCAM DRIVER

P:	Jean-Francois Moine

M:	moinejf@free.fr

W:	http://moinejf.free.fr

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



HARDWARE MONITORING
@@ -2437,7 +2444,8 @@ P: Hans Verkuil 
M:	hverkuil@xs4all.nl

L:	ivtv-devel@ivtvdriver.org

L:	ivtv-users@ivtvdriver.org

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://www.ivtvdriver.org

S:	Maintained
@@ -3197,7 +3205,8 @@ S: Maintained 
OMNIVISION OV7670 SENSOR DRIVER

P:	Jonathan Corbet

M:	corbet@lwn.net

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



ONENAND FLASH DRIVER
@@ -3479,8 +3488,9 @@ PVRUSB2 VIDEO4LINUX DRIVER 
P:	Mike Isely

M:	isely@pobox.com

L:	pvrusb2@isely.net	(subscribers-only)

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

W:	http://www.isely.net/pvrusb2/

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



PXA2xx/PXA3xx SUPPORT
@@ -3700,6 +3710,8 @@ S: Supported 
SAA7146 VIDEO4LINUX-2 DRIVER

P:	Michael Hunold

M:	michael@mihu.de

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://www.mihu.de/linux/saa7146

S:	Maintained
@@ -3963,7 +3975,8 @@ S: Maintained 
SOC-CAMERA V4L2 SUBSYSTEM

P:	Guennadi Liakhovetski

M:	g.liakhovetski@gmx.de

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



SOEKRIS NET48XX LED SUPPORT
@@ -4382,7 +4395,8 @@ USB ET61X[12]51 DRIVER 
P:	Luca Risolia

M:	luca.risolia@studio.unibo.it

L:	linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://www.linux-projects.org

S:	Maintained
@@ -4531,7 +4545,8 @@ USB SN9C1xx DRIVER 
P:	Luca Risolia

M:	luca.risolia@studio.unibo.it

L:	linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://www.linux-projects.org

S:	Maintained
@@ -4560,7 +4575,8 @@ USB VIDEO CLASS 
P:	Laurent Pinchart

M:	laurent.pinchart@skynet.be

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

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

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

S:	Maintained
@@ -4568,7 +4584,8 @@ USB W996[87]CF DRIVER 
P:	Luca Risolia

M:	luca.risolia@studio.unibo.it

L:	linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://www.linux-projects.org

S:	Maintained
@@ -4582,7 +4599,8 @@ USB ZC0301 DRIVER 
P:	Luca Risolia

M:	luca.risolia@studio.unibo.it

L:	linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://www.linux-projects.org

S:	Maintained
@@ -4597,7 +4615,8 @@ USB ZR364XX DRIVER 
P:	Antoine Jacquet

M:	royale@zerezo.com

L:	linux-usb@vger.kernel.org

L:	video4linux-list@redhat.com

L:	linux-media@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://royale.zerezo.com/zr364xx/

S:	Maintained
@@ -4666,10 +4685,10 @@ S: Maintained 
VIDEO FOR LINUX (V4L)

P:	Mauro Carvalho Chehab

M:	mchehab@infradead.org

M:	v4l-dvb-maintainer@linuxtv.org

L:	linux-media@vger.kernel.org

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

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

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained



VLAN (802.1Q)

drivers/media/common/tuners/tda8290.c

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void set_audio(struct dvb_frontend *fe, 
	}

}



struct {

static struct {

	unsigned char seq[2];

} fm_mode[] = {

	{ { 0x01, 0x81} },	/* Put device into expert mode */
@@ -207,7 +207,6 @@ static void tda8290_set_params(struct dvb_frontend *fe, 
	msleep(1);



	if (params->mode == V4L2_TUNER_RADIO) {

		int i;

		unsigned char deemphasis[]  = { 0x13, 1 };



		/* FIXME: allow using a different deemphasis */
@@ -767,6 +766,7 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe, 
	fe->ops.analog_ops.info.name = name;



	if (priv->ver & TDA8290) {

		if (priv->ver & (TDA8275 | TDA8275A))

			tda8290_init_tuner(fe);

		tda8290_init_if(fe);

	} else if (priv->ver & TDA8295)

drivers/media/dvb/dm1105/Kconfig

+1 −0
Original line number Diff line number Diff line 
config DVB_DM1105

	tristate "SDMC DM1105 based PCI cards"

	depends on DVB_CORE && PCI && I2C

	depends on INPUT

	select DVB_PLL if !DVB_FE_CUSTOMISE

	select DVB_STV0299 if !DVB_FE_CUSTOMISE

	select DVB_STV0288 if !DVB_FE_CUSTOMISE

drivers/media/dvb/dvb-core/dvb_frontend.c

+15 −11
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe, 
	return 0;

}



struct dtv_cmds_h dtv_cmds[] = {

static struct dtv_cmds_h dtv_cmds[] = {

	[DTV_TUNE] = {

		.name	= "DTV_TUNE",

		.cmd	= DTV_TUNE,
@@ -962,7 +962,7 @@ struct dtv_cmds_h dtv_cmds[] = { 
	},

};



void dtv_property_dump(struct dtv_property *tvp)

static void dtv_property_dump(struct dtv_property *tvp)

{

	int i;
@@ -993,7 +993,7 @@ void dtv_property_dump(struct dtv_property *tvp) 
		dprintk("%s() tvp.u.data = 0x%08x\n", __func__, tvp->u.data);

}



int is_legacy_delivery_system(fe_delivery_system_t s)

static int is_legacy_delivery_system(fe_delivery_system_t s)

{

	if((s == SYS_UNDEFINED) || (s == SYS_DVBC_ANNEX_AC) ||

	   (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS) ||
@@ -1007,7 +1007,8 @@ int is_legacy_delivery_system(fe_delivery_system_t s) 
 * drivers can use a single set_frontend tuning function, regardless of whether

 * it's being used for the legacy or new API, reducing code and complexity.

 */

void dtv_property_cache_sync(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)

static void dtv_property_cache_sync(struct dvb_frontend *fe,

				    struct dvb_frontend_parameters *p)

{

	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
@@ -1059,7 +1060,7 @@ void dtv_property_cache_sync(struct dvb_frontend *fe, struct dvb_frontend_parame 
/* Ensure the cached values are set correctly in the frontend

 * legacy tuning structures, for the advanced tuning API.

 */

void dtv_property_legacy_params_sync(struct dvb_frontend *fe)

static void dtv_property_legacy_params_sync(struct dvb_frontend *fe)

{

	struct dtv_frontend_properties *c = &fe->dtv_property_cache;

	struct dvb_frontend_private *fepriv = fe->frontend_priv;
@@ -1114,7 +1115,7 @@ void dtv_property_legacy_params_sync(struct dvb_frontend *fe) 
/* Ensure the cached values are set correctly in the frontend

 * legacy tuning structures, for the legacy tuning API.

 */

void dtv_property_adv_params_sync(struct dvb_frontend *fe)

static void dtv_property_adv_params_sync(struct dvb_frontend *fe)

{

	struct dtv_frontend_properties *c = &fe->dtv_property_cache;

	struct dvb_frontend_private *fepriv = fe->frontend_priv;
@@ -1149,7 +1150,7 @@ void dtv_property_adv_params_sync(struct dvb_frontend *fe) 
	}

}



void dtv_property_cache_submit(struct dvb_frontend *fe)

static void dtv_property_cache_submit(struct dvb_frontend *fe)

{

	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
@@ -1180,7 +1181,8 @@ static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file, 
static int dvb_frontend_ioctl_properties(struct inode *inode, struct file *file,

			unsigned int cmd, void *parg);



int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp,

static int dtv_property_process_get(struct dvb_frontend *fe,

				    struct dtv_property *tvp,

				    struct inode *inode, struct file *file)

{

	int r = 0;
@@ -1253,8 +1255,10 @@ int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp, 
	return r;

}



int dtv_property_process_set(struct dvb_frontend *fe, struct dtv_property *tvp,

	struct inode *inode, struct file *file)

static int dtv_property_process_set(struct dvb_frontend *fe,

				    struct dtv_property *tvp,

				    struct inode *inode,

				    struct file *file)

{

	int r = 0;

	struct dvb_frontend_private *fepriv = fe->frontend_priv;

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
static int dvb_usb_anysee_debug;

module_param_named(debug, dvb_usb_anysee_debug, int, 0644);

MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);

int dvb_usb_anysee_delsys;

static int dvb_usb_anysee_delsys;

module_param_named(delsys, dvb_usb_anysee_delsys, int, 0644);

MODULE_PARM_DESC(delsys, "select delivery mode (0=DVB-C, 1=DVB-T)");

DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE