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

Commit e23739b4 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 

Pull media fixes from Mauro Carvalho Chehab:
 "For some media fixes:
   - dvb_usb_v2: some fixes at the core
   - Some fixes on some embedded drivers: soc_camera, adv7604, omap3isp,
     exynos/s5p
   - Several Exynos4/5 camera fixes
   - a fix at stv0900 driver
   - a few USB ID additions to detect more variants of rtl28xxu-based
     sticks"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (25 commits)
  [media] rtl28xxu: 0ccd:00d7 TerraTec Cinergy T Stick+
  [media] rtl28xxu: 1d19:1102 Dexatek DK mini DVB-T Dongle
  [media] mt9v022: fix the V4L2_CID_EXPOSURE control
  [media] mx2_camera: fix missing unlock on error in mx2_start_streaming()
  [media] media: omap1_camera: fix const cropping related warnings
  [media] media: mx1_camera: use the default .set_crop() implementation
  [media] media: mx2_camera: fix const cropping related warnings
  [media] media: mx3_camera: fix const cropping related warnings
  [media] media: pxa_camera: fix const cropping related warnings
  [media] media: sh_mobile_ceu_camera: fix const cropping related warnings
  [media] media: sh_vou: fix const cropping related warnings
  [media] adv7604: restart STDI once if format is not found
  [media] adv7604: use presets where possible
  [media] adv7604: Replace prim_mode by mode
  [media] adv7604: cleanup references
  [media] dvb_usb_v2: switch interruptible mutex to normal
  [media] dvb_usb_v2: fix pid_filter callback error logging
  [media] exynos-gsc: change driver compatible string
  [media] omap3isp: Fix warning caused by bad subdev events operations prototypes
  [media] omap3isp: video: Fix warning caused by bad vidioc_s_crop prototype
  ...
parents 2844a487 86163adb

drivers/media/dvb-frontends/stv0900_core.c

+3 −3
Original line number Diff line number Diff line
@@ -300,15 +300,15 @@ static enum fe_stv0900_error stv0900_set_mclk(struct stv0900_internal *intp, u32 
{

	u32 m_div, clk_sel;



	dprintk("%s: Mclk set to %d, Quartz = %d\n", __func__, mclk,

			intp->quartz);



	if (intp == NULL)

		return STV0900_INVALID_HANDLE;



	if (intp->errs)

		return STV0900_I2C_ERROR;



	dprintk("%s: Mclk set to %d, Quartz = %d\n", __func__, mclk,

			intp->quartz);



	clk_sel = ((stv0900_get_bits(intp, F0900_SELX1RATIO) == 1) ? 4 : 6);

	m_div = ((clk_sel * mclk) / intp->quartz) - 1;

	stv0900_write_bits(intp, F0900_M_DIV, m_div);

drivers/media/i2c/adv7604.c

+272 −105

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/i2c/soc_camera/mt9v022.c

+8 −3
Original line number Diff line number Diff line
@@ -263,9 +263,14 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a) 
		if (ret & 1) /* Autoexposure */

			ret = reg_write(client, mt9v022->reg->max_total_shutter_width,

					rect.height + mt9v022->y_skip_top + 43);

		else

			ret = reg_write(client, MT9V022_TOTAL_SHUTTER_WIDTH,

					rect.height + mt9v022->y_skip_top + 43);

		/*

		 * If autoexposure is off, there is no need to set

		 * MT9V022_TOTAL_SHUTTER_WIDTH here. Autoexposure can be off

		 * only if the user has set exposure manually, using the

		 * V4L2_CID_EXPOSURE_AUTO with the value V4L2_EXPOSURE_MANUAL.

		 * In this case the register MT9V022_TOTAL_SHUTTER_WIDTH

		 * already contains the correct value.

		 */

	}

	/* Setup frame format: defaults apart from width and height */

	if (!ret)

drivers/media/platform/exynos-gsc/gsc-core.c

+4 −2
Original line number Diff line number Diff line
@@ -965,8 +965,10 @@ static struct platform_device_id gsc_driver_ids[] = { 
MODULE_DEVICE_TABLE(platform, gsc_driver_ids);



static const struct of_device_id exynos_gsc_match[] = {

	{ .compatible = "samsung,exynos5250-gsc",

	.data = &gsc_v_100_drvdata, },

	{

		.compatible = "samsung,exynos5-gsc",

		.data = &gsc_v_100_drvdata,

	},

	{},

};

MODULE_DEVICE_TABLE(of, exynos_gsc_match);

drivers/media/platform/omap3isp/ispccdc.c

+2 −2
Original line number Diff line number Diff line
@@ -1706,7 +1706,7 @@ static long ccdc_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) 
}



static int ccdc_subscribe_event(struct v4l2_subdev *sd, struct v4l2_fh *fh,

				const struct v4l2_event_subscription *sub)

				struct v4l2_event_subscription *sub)

{

	if (sub->type != V4L2_EVENT_FRAME_SYNC)

		return -EINVAL;
@@ -1719,7 +1719,7 @@ static int ccdc_subscribe_event(struct v4l2_subdev *sd, struct v4l2_fh *fh, 
}



static int ccdc_unsubscribe_event(struct v4l2_subdev *sd, struct v4l2_fh *fh,

				  const struct v4l2_event_subscription *sub)

				  struct v4l2_event_subscription *sub)

{

	return v4l2_event_unsubscribe(fh, sub);

}