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

Commit 0d815142 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: (25 commits)
  em28xx: remove backward compat macro added on a previous fix
  V4L/DVB (9748): em28xx: fix compile warning
  V4L/DVB (9743): em28xx: fix oops audio
  V4L/DVB (9742): em28xx-alsa: implement another locking schema
  V4L/DVB (9732): sms1xxx: use new firmware for Hauppauge WinTV MiniStick
  V4L/DVB (9691): gspca: Move the video device to a separate area.
  V4L/DVB (9690): gspca: Lock the subdrivers via module_get/put.
  V4L/DVB (9689): gspca: Memory leak when disconnect while streaming.
  V4L/DVB (9668): em28xx: fix a race condition with hald
  V4L/DVB (9664): af9015: don't reconnect device in USB-bus
  V4L/DVB (9647): em28xx: void having two concurrent control URB's
  V4L/DVB (9646): em28xx: avoid allocating/dealocating memory on every control urb
  V4L/DVB (9645): em28xx: Avoid memory leaks if registration fails
  V4L/DVB (9639): Make dib0700 remote control support work with firmware v1.20
  V4L/DVB (9635): v4l: s2255drv fix firmware test on big-endian
  V4L/DVB (9634): Make sure the i2c gate is open before powering down tuner
  V4L/DVB (9632): make em28xx aux audio input work
  V4L/DVB (9631): Make s2api work for ATSC support
  V4L/DVB (9627): em28xx: Avoid i2c register error for boards without eeprom
  V4L/DVB (9608): Fix section mismatch warning for dm1105 during make
  ...
parents 9c84ba4e a693b0cd

drivers/media/dvb/dm1105/dm1105.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb) 
	pci_free_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, dm1105dvb->ts_buf, dm1105dvb->dma_addr);

}



static void __devinit dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb)

static void dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb)

{

	outb(INTMAK_ALLMASK, dm_io_mem(DM1105_INTMAK));

	outb(1, dm_io_mem(DM1105_CR));

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

+4 −1
Original line number Diff line number Diff line
@@ -585,6 +585,8 @@ restart: 
		if (fe->ops.set_voltage)

			fe->ops.set_voltage(fe, SEC_VOLTAGE_OFF);

		if (fe->ops.tuner_ops.sleep) {

			if (fe->ops.i2c_gate_ctrl)

				fe->ops.i2c_gate_ctrl(fe, 1);

			fe->ops.tuner_ops.sleep(fe);

			if (fe->ops.i2c_gate_ctrl)

				fe->ops.i2c_gate_ctrl(fe, 0);
@@ -934,7 +936,8 @@ void dtv_property_dump(struct dtv_property *tvp) 
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))

	   (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS) ||

	   (s == SYS_ATSC))

		return 1;



	return 0;

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

+2 −6
Original line number Diff line number Diff line
@@ -681,12 +681,6 @@ static int af9015_download_firmware(struct usb_device *udev, 
		goto error;

	}



	/* firmware is running, reconnect device in the usb bus */

	req.cmd = RECONNECT_USB;

	ret = af9015_rw_udev(udev, &req);

	if (ret)

		err("reconnect failed: %d", ret);



error:

	return ret;

}
@@ -1208,6 +1202,7 @@ static struct dvb_usb_device_properties af9015_properties[] = { 
		.usb_ctrl = DEVICE_SPECIFIC,

		.download_firmware = af9015_download_firmware,

		.firmware = "dvb-usb-af9015.fw",

		.no_reconnect = 1,



		.size_of_priv = sizeof(struct af9015_state), \
@@ -1306,6 +1301,7 @@ static struct dvb_usb_device_properties af9015_properties[] = { 
		.usb_ctrl = DEVICE_SPECIFIC,

		.download_firmware = af9015_download_firmware,

		.firmware = "dvb-usb-af9015.fw",

		.no_reconnect = 1,



		.size_of_priv = sizeof(struct af9015_state), \

drivers/media/dvb/dvb-usb/dib0700.h

+4 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ extern int dvb_usb_dib0700_debug; 


#define REQUEST_I2C_READ     0x2

#define REQUEST_I2C_WRITE    0x3

#define REQUEST_POLL_RC      0x4

#define REQUEST_POLL_RC      0x4 /* deprecated in firmware v1.20 */

#define REQUEST_JUMPRAM      0x8

#define REQUEST_SET_CLOCK    0xB

#define REQUEST_SET_GPIO     0xC
@@ -40,11 +40,14 @@ struct dib0700_state { 
	u16 mt2060_if1[2];

	u8 rc_toggle;

	u8 rc_counter;

	u8 rc_func_version;

	u8 is_dib7000pc;

	u8 fw_use_new_i2c_api;

	u8 disable_streaming_master_mode;

};



extern int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,

			       u32 *romversion, u32 *ramversion, u32 *fwtype);

extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val);

extern int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3);

extern int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen);

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

+16 −0
Original line number Diff line number Diff line
@@ -19,6 +19,22 @@ MODULE_PARM_DESC(dvb_usb_dib0700_ir_proto, "set ir protocol (0=NEC, 1=RC5 (defau 


DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);





int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion,

			u32 *romversion, u32 *ramversion, u32 *fwtype)

{

	u8 b[16];

	int ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0),

				  REQUEST_GET_VERSION,

				  USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,

				  b, sizeof(b), USB_CTRL_GET_TIMEOUT);

	*hwversion  = (b[0] << 24)  | (b[1] << 16)  | (b[2] << 8)  | b[3];

	*romversion = (b[4] << 24)  | (b[5] << 16)  | (b[6] << 8)  | b[7];

	*ramversion = (b[8] << 24)  | (b[9] << 16)  | (b[10] << 8) | b[11];

	*fwtype     = (b[12] << 24) | (b[13] << 16) | (b[14] << 8) | b[15];

	return ret;

}



/* expecting rx buffer: request data[0] data[1] ... data[2] */

static int dib0700_ctrl_wr(struct dvb_usb_device *d, u8 *tx, u8 txlen)

{