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

Commit 100b4254 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (5305): Mark VIDIOC_DBG_S/G_REGISTER as experimental
  V4L/DVB (5271): Add VIDIOC_TRY_ENCODER_CMD and VIDIOC_ENCODER_CMD ioctls.
  V4L/DVB (5270): Add VIDIOC_G_ENC_INDEX ioctl
  V4L/DVB (5276): Cxusb: fix firmware patch for big endian systems
  V4L/DVB (5258): Cafe_ccic: fix compiler warning
  V4L/DVB (5295): Digitv: open nxt6000 i2c_gate for TDED4 tuner handling
  V4L/DVB (5304): Improve chip matching in v4l2_register
  V4L/DVB (5255): Fix cx25840 firmware loading.
parents d701d8a3 f3502b8a

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

+2 −2
Original line number Diff line number Diff line
@@ -469,9 +469,9 @@ static int bluebird_patch_dvico_firmware_download(struct usb_device *udev, 
	    fw->data[BLUEBIRD_01_ID_OFFSET + 1] == USB_VID_DVICO >> 8) {



		fw->data[BLUEBIRD_01_ID_OFFSET + 2] =

			udev->descriptor.idProduct + 1;

			le16_to_cpu(udev->descriptor.idProduct) + 1;

		fw->data[BLUEBIRD_01_ID_OFFSET + 3] =

			udev->descriptor.idProduct >> 8;

			le16_to_cpu(udev->descriptor.idProduct) >> 8;



		return usb_cypress_load_firmware(udev, fw, CYPRESS_FX2);

	}

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

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_f 
	struct dvb_usb_adapter *adap = fe->dvb->priv;

	u8 b[5];

	dvb_usb_tuner_calc_regs(fe,fep,b, 5);

	if (fe->ops.i2c_gate_ctrl)

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

	return digitv_ctrl_msg(adap->dev, USB_WRITE_TUNER, 0, &b[1], 4, NULL, 0);

}

drivers/media/video/cafe_ccic.c

+1 −3
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ static ssize_t cafe_v4l_read(struct file *filp, 
		char __user *buffer, size_t len, loff_t *pos)

{

	struct cafe_camera *cam = filp->private_data;

	int ret;

	int ret = 0;



	/*

	 * Perhaps we're in speculative read mode and already
@@ -1251,8 +1251,6 @@ static int cafe_vidioc_reqbufs(struct file *filp, void *priv, 


	if (cam->n_sbufs == 0)  /* no luck at all - ret already set */

		kfree(cam->sb_bufs);

	else

		ret = 0;

	req->count = cam->n_sbufs;  /* In case of partial success */



  out:

drivers/media/video/cx25840/cx25840-core.c

+3 −3
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd, 
	{

		struct v4l2_register *reg = arg;



		if (reg->i2c_id != I2C_DRIVERID_CX25840)

		if (!v4l2_chip_match_i2c_client(client, reg->match_type, reg->match_chip))

			return -EINVAL;

		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;
@@ -903,13 +903,13 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address, 
	state->vbi_line_offset = 8;

	state->id = id;



	i2c_attach_client(client);



	if (state->is_cx25836)

		cx25836_initialize(client);

	else

		cx25840_initialize(client, 1);



	i2c_attach_client(client);



	return 0;

}

drivers/media/video/cx25840/cx25840-firmware.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
 */

#define FWSEND 48



#define FWDEV(x) &((x)->adapter->dev)

#define FWDEV(x) &((x)->dev)



static char *firmware = FWFILE;