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

Commit e6f1227e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] v4l2-ctrl: Send change events to all fh for auto cluster slave controls
  [media] v4l2-event: Don't set sev->fh to NULL on unsubscribe
  [media] v4l2-event: Remove pending events from fh event queue when unsubscribing
  [media] v4l2-event: Deny subscribing with a type of V4L2_EVENT_ALL
  [media] MAINTAINERS: add a maintainer for s5p-mfc driver
  [media] v4l: s5p-mfc: fix reported capabilities
  [media] media: vb2: reset queued list on REQBUFS(0) call
  [media] media: vb2: set buffer length correctly for all buffer types
  [media] media: vb2: add a check for uninitialized buffer
  [media] mxl111sf: fix build warning
  [media] mxl111sf: remove pointless if condition in mxl111sf_config_spi
  [media] mxl111sf: check for errors after mxl111sf_write_reg in mxl111sf_idac_config
  [media] mxl111sf: fix return value of mxl111sf_idac_config
  [media] uvcvideo: GET_RES should only be checked for BITMAP type menu controls
parents 3455229f 1249a3a8

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -1106,6 +1106,7 @@ F: drivers/media/video/s5p-fimc/ 
ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT

ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT

M:	Kyungmin Park <kyungmin.park@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

M:	Kamil Debski <k.debski@samsung.com>

M:	Kamil Debski <k.debski@samsung.com>

M:     Jeongtae Park <jtp.park@samsung.com>

L:	linux-arm-kernel@lists.infradead.org

L:	linux-arm-kernel@lists.infradead.org

L:	linux-media@vger.kernel.org

L:	linux-media@vger.kernel.org

S:	Maintained

S:	Maintained

drivers/media/dvb/dvb-usb/mxl111sf-i2c.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -398,7 +398,6 @@ static int mxl111sf_i2c_readagain(struct mxl111sf_state *state, 
	u8 i2c_r_data[24];

	u8 i2c_r_data[24];

	u8 i = 0;

	u8 i = 0;

	u8 fifo_status = 0;

	u8 fifo_status = 0;

	int ret;

	int status = 0;

	int status = 0;





	mxl_i2c("read %d bytes", count);

	mxl_i2c("read %d bytes", count);
@@ -418,7 +417,7 @@ static int mxl111sf_i2c_readagain(struct mxl111sf_state *state, 
		i2c_w_data[4+(i*3)] = 0x00;

		i2c_w_data[4+(i*3)] = 0x00;

	}

	}





	ret = mxl111sf_i2c_get_data(state, 0, i2c_w_data, i2c_r_data);

	mxl111sf_i2c_get_data(state, 0, i2c_w_data, i2c_r_data);





	/* Check for I2C NACK status */

	/* Check for I2C NACK status */

	if (mxl111sf_i2c_check_status(state) == 1) {

	if (mxl111sf_i2c_check_status(state) == 1) {

drivers/media/dvb/dvb-usb/mxl111sf-phy.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -296,8 +296,7 @@ int mxl111sf_config_spi(struct mxl111sf_state *state, int onoff) 
		goto fail;

		goto fail;





	ret = mxl111sf_write_reg(state, 0x00, 0x00);

	ret = mxl111sf_write_reg(state, 0x00, 0x00);

	if (mxl_fail(ret))

	mxl_fail(ret);

		goto fail;

fail:

fail:

	return ret;

	return ret;

}

}
@@ -328,11 +327,13 @@ int mxl111sf_idac_config(struct mxl111sf_state *state, 
		/* set hysteresis value  reg: 0x0B<5:0> */

		/* set hysteresis value  reg: 0x0B<5:0> */

		ret = mxl111sf_write_reg(state, V6_IDAC_HYSTERESIS_REG,

		ret = mxl111sf_write_reg(state, V6_IDAC_HYSTERESIS_REG,

					 (hysteresis_value & 0x3F));

					 (hysteresis_value & 0x3F));

		mxl_fail(ret);

	}

	}





	ret = mxl111sf_write_reg(state, V6_IDAC_SETTINGS_REG, val);

	ret = mxl111sf_write_reg(state, V6_IDAC_SETTINGS_REG, val);

	mxl_fail(ret);





	return val;

	return ret;

}

}





/*

/*

drivers/media/video/s5p-mfc/s5p_mfc_dec.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -220,8 +220,8 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1);

	strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1);

	cap->bus_info[0] = 0;

	cap->bus_info[0] = 0;

	cap->version = KERNEL_VERSION(1, 0, 0);

	cap->version = KERNEL_VERSION(1, 0, 0);

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE_MPLANE |

						    | V4L2_CAP_STREAMING;

			V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_STREAMING;

	return 0;

	return 0;

}

}

drivers/media/video/s5p-mfc/s5p_mfc_enc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -785,8 +785,8 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1);

	strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1);

	cap->bus_info[0] = 0;

	cap->bus_info[0] = 0;

	cap->version = KERNEL_VERSION(1, 0, 0);

	cap->version = KERNEL_VERSION(1, 0, 0);

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE_MPLANE

			  | V4L2_CAP_VIDEO_OUTPUT

			  | V4L2_CAP_VIDEO_OUTPUT_MPLANE

			  | V4L2_CAP_STREAMING;

			  | V4L2_CAP_STREAMING;

	return 0;

	return 0;

}

}