Commit a5e63931 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 (13372): staging/go7007: fix mutex function usage for s2250
  staging/go7007: Fix compilation by re-adding the missing s2250-loader.h
  V4L/DVB (13530): Fix wrong parameter order in memset
  V4L/DVB (13481): sh_mobile_ceu_camera: fix compile warning
  V4L/DVB (13436): cxusb: Fix hang on DViCO FusionHDTV DVB-T Dual Digital 4 (rev 1)
  V4L/DVB (13412): SMS_SIANO_MDTV should depend on HAS_DMA
  V4L/DVB (13372a): MAINTAINERS: addition of gspca_gl860 driver
  V4L/DVB (13371): davinci: remove stray duplicate config pointer
  V4L/DVB (13366): em28xx: fix Reddo DVB-C USB TV Box GPIO
  V4L/DVB (13345): soc-camera: sh_mobile_ceu_camera: call pm_runtime_disable
  V4L/DVB (13344): soc-camera: properly initialise the device object when reusing
  V4L/DVB (13343): v4l: add more missing linux/sched.h includes
  V4L/DVB (13321): radio-gemtek-pci: fix double mutex_lock
parents 97096527 e49bd72f

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2312,6 +2312,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git 
S:	Maintained

F:	drivers/media/video/gspca/finepix.c



GSPCA GL860 SUBDRIVER

M:	Olivier Lorin <o.lorin@laposte.net>

L:	linux-media@vger.kernel.org

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

S:	Maintained

F:	drivers/media/video/gspca/gl860/



GSPCA M5602 SUBDRIVER

M:	Erik Andren <erik.andren@gmail.com>

L:	linux-media@vger.kernel.org

drivers/media/common/ir-functions.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir, 


	ir->ir_type = ir_type;



	memset(ir->ir_codes, sizeof(ir->ir_codes), 0);

	memset(ir->ir_codes, 0, sizeof(ir->ir_codes));



	/*

	 * FIXME: This is a temporary workaround to use the new IR tables

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

+9 −1
Original line number Diff line number Diff line
@@ -663,6 +663,14 @@ static struct zl10353_config cxusb_zl10353_xc3028_config = { 
	.parallel_ts = 1,

};



static struct zl10353_config cxusb_zl10353_xc3028_config_no_i2c_gate = {

	.demod_address = 0x0f,

	.if2 = 45600,

	.no_tuner = 1,

	.parallel_ts = 1,

	.disable_i2c_gate_ctrl = 1,

};



static struct mt352_config cxusb_mt352_xc3028_config = {

	.demod_address = 0x0f,

	.if2 = 4560,
@@ -894,7 +902,7 @@ static int cxusb_dualdig4_frontend_attach(struct dvb_usb_adapter *adap) 
	cxusb_bluebird_gpio_pulse(adap->dev, 0x02, 1);



	if ((adap->fe = dvb_attach(zl10353_attach,

				   &cxusb_zl10353_xc3028_config,

				   &cxusb_zl10353_xc3028_config_no_i2c_gate,

				   &adap->dev->i2c_adap)) == NULL)

		return -EIO;

drivers/media/dvb/siano/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


config SMS_SIANO_MDTV

	tristate "Siano SMS1xxx based MDTV receiver"

	depends on DVB_CORE && INPUT

	depends on DVB_CORE && INPUT && HAS_DMA

	---help---

	  Choose Y or M here if you have MDTV receiver with a Siano chipset.

drivers/media/radio/radio-gemtek-pci.c

+0 −2
Original line number Diff line number Diff line
@@ -181,12 +181,10 @@ static void gemtek_pci_mute(struct gemtek_pci *card) 


static void gemtek_pci_unmute(struct gemtek_pci *card)

{

	mutex_lock(&card->lock);

	if (card->mute) {

		gemtek_pci_setfrequency(card, card->current_frequency);

		card->mute = false;

	}

	mutex_unlock(&card->lock);

}



static int gemtek_pci_getsignal(struct gemtek_pci *card)

CRA Git | Maintained and supported by SUSTech CRA and CCSE