Commit 3e382dd9 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:
 "A series of small fixes.  Mostly driver ones.  There is one core
  regression fix on a patch that was meant to fix some race issues on
  vb2, but that actually caused more harm than good.  So, we're just
  reverting it for now"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] adv7842: Composite free-run platfrom-data fix
  [media] v4l2-dv-timings: fix GTF calculation
  [media] hdpvr: Fix memory leak in debug
  [media] af9035: add ID [2040:f900] Hauppauge WinTV-MiniStick 2
  [media] mxl111sf: Fix compile when CONFIG_DVB_USB_MXL111SF is unset
  [media] mxl111sf: Fix unintentional garbage stack read
  [media] cx24117: use a valid dev pointer for dev_err printout
  [media] cx24117: remove dead code in always 'false' if statement
  [media] update Michael Krufky's email address
  [media] vb2: Check if there are buffers before streamon
  [media] Revert "[media] videobuf_vm_{open,close} race fixes"
  [media] go7007-loader: fix usb_dev leak
  [media] media: bt8xx: add missing put_device call
  [media] exynos4-is: Compile in fimc-lite runtime PM callbacks conditionally
  [media] exynos4-is: Compile in fimc runtime PM callbacks conditionally
  [media] exynos4-is: Fix error paths in probe() for !pm_runtime_enabled()
  [media] s5p-jpeg: Fix wrong NV12 format parameters
  [media] s5k5baf: allow to handle arbitrary long i2c sequences
parents 2091f435 57f0547f

Documentation/dvb/contributors.txt

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ Peter Beutner <p.beutner@gmx.net> 
Wilson Michaels <wilsonmichaels@earthlink.net>

  for the lgdt330x frontend driver, and various bugfixes



Michael Krufky <mkrufky@m1k.net>

Michael Krufky <mkrufky@linuxtv.org>

  for maintaining v4l/dvb inter-tree dependencies



Taylor Jacob <rtjacob@earthlink.net>

drivers/media/dvb-frontends/cx24117.c

+1 −9
Original line number Diff line number Diff line
@@ -1176,7 +1176,7 @@ struct dvb_frontend *cx24117_attach(const struct cx24117_config *config, 


	switch (demod) {

	case 0:

		dev_err(&state->priv->i2c->dev,

		dev_err(&i2c->dev,

			"%s: Error attaching frontend %d\n",

			KBUILD_MODNAME, demod);

		goto error1;
@@ -1200,12 +1200,6 @@ struct dvb_frontend *cx24117_attach(const struct cx24117_config *config, 
	state->demod = demod - 1;

	state->priv = priv;



	/* test i2c bus for ack */

	if (demod == 0) {

		if (cx24117_readreg(state, 0x00) < 0)

			goto error3;

	}



	dev_info(&state->priv->i2c->dev,

		"%s: Attaching frontend %d\n",

		KBUILD_MODNAME, state->demod);
@@ -1216,8 +1210,6 @@ struct dvb_frontend *cx24117_attach(const struct cx24117_config *config, 
	state->frontend.demodulator_priv = state;

	return &state->frontend;



error3:

	kfree(state);

error2:

	cx24117_release_priv(priv);

error1:

drivers/media/dvb-frontends/nxt200x.c

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *    Support for NXT2002 and NXT2004 - VSB/QAM

 *

 *    Copyright (C) 2005 Kirk Lapray <kirk.lapray@gmail.com>

 *    Copyright (C) 2006 Michael Krufky <mkrufky@m1k.net>

 *    Copyright (C) 2006-2014 Michael Krufky <mkrufky@linuxtv.org>

 *    based on nxt2002 by Taylor Jacob <rtjacob@earthlink.net>

 *    and nxt2004 by Jean-Francois Thibert <jeanfrancois@sagetv.com>

 *

drivers/media/i2c/adv7842.c

+1 −1
Original line number Diff line number Diff line
@@ -2554,7 +2554,7 @@ static int adv7842_core_init(struct v4l2_subdev *sd) 
	sdp_write_and_or(sd, 0xdd, 0xf0, pdata->sdp_free_run_force |

					 (pdata->sdp_free_run_cbar_en << 1) |

					 (pdata->sdp_free_run_man_col_en << 2) |

					 (pdata->sdp_free_run_force << 3));

					 (pdata->sdp_free_run_auto << 3));



	/* TODO from platform data */

	cp_write(sd, 0x69, 0x14);   /* Enable CP CSC */

drivers/media/i2c/s5k5baf.c

+19 −11
Original line number Diff line number Diff line
@@ -478,25 +478,33 @@ static void s5k5baf_write_arr_seq(struct s5k5baf *state, u16 addr, 
				  u16 count, const u16 *seq)

{

	struct i2c_client *c = v4l2_get_subdevdata(&state->sd);

	__be16 buf[count + 1];

	int ret, n;

	__be16 buf[65];



	s5k5baf_i2c_write(state, REG_CMDWR_ADDR, addr);

	if (state->error)

		return;



	v4l2_dbg(3, debug, c, "i2c_write_seq(count=%d): %*ph\n", count,

		 min(2 * count, 64), seq);



	buf[0] = __constant_cpu_to_be16(REG_CMD_BUF);

	for (n = 1; n <= count; ++n)

		buf[n] = cpu_to_be16(*seq++);



	n *= 2;

	ret = i2c_master_send(c, (char *)buf, n);

	v4l2_dbg(3, debug, c, "i2c_write_seq(count=%d): %*ph\n", count,

		 min(2 * count, 64), seq - count);

	while (count > 0) {

		int n = min_t(int, count, ARRAY_SIZE(buf) - 1);

		int ret, i;



	if (ret != n) {

		for (i = 1; i <= n; ++i)

			buf[i] = cpu_to_be16(*seq++);



		i *= 2;

		ret = i2c_master_send(c, (char *)buf, i);

		if (ret != i) {

			v4l2_err(c, "i2c_write_seq: error during transfer (%d)\n", ret);

			state->error = ret;

			break;

		}



		count -= n;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE