Commit 675722b0 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'upstream-fixes' into patchwork 

Merge the media fixes merged upstream for v3.13-rc4

* upstream-fixes: (30 commits)
  [media] videobuf2-dma-sg: fix possible memory leak
  [media] vb2: regression fix: always set length field.
  [media] mt9p031: Include linux/of.h header
  [media] rtl2830: add parent for I2C adapter
  [media] media: marvell-ccic: use devm to release clk
  [media] ths7303: Declare as static a private function
  [media] em28xx-video: Swap release order to avoid lock nesting
  [media] usbtv: Add support for PAL video source
  [media] media_tree: Fix spelling errors
  [media] videobuf2: Add support for file access mode flags for DMABUF exporting
  [media] radio-shark2: Mark shark_resume_leds() inline to kill compiler warning
  [media] radio-shark: Mark shark_resume_leds() inline to kill compiler warning
  [media] af9035: unlock on error in af9035_i2c_master_xfer()
  [media] af9033: fix broken I2C
  [media] v4l: omap3isp: Don't check for missing get_fmt op on remote subdev
  [media] af9035: fix broken I2C and USB I/O
  [media] wm8775: fix broken audio routing
  [media] marvell-ccic: drop resource free in driver remove
  [media] tef6862/radio-tea5764: actually assign clamp result
  [media] cx231xx: use after free on error path in probe
  ...
parents 989af883 64c832a4

drivers/media/dvb-core/dvb_demux.c

+6 −1
Original line number Diff line number Diff line
@@ -1032,8 +1032,13 @@ static int dmx_section_feed_release_filter(struct dmx_section_feed *feed, 
		return -EINVAL;

	}



	if (feed->is_filtering)

	if (feed->is_filtering) {

		/* release dvbdmx->mutex as far as it is

		   acquired by stop_filtering() itself */

		mutex_unlock(&dvbdmx->mutex);

		feed->stop_filtering(feed);

		mutex_lock(&dvbdmx->mutex);

	}



	spin_lock_irq(&dvbdmx->lock);

	f = dvbdmxfeed->filter;

drivers/media/dvb-frontends/af9033.c

+6 −6
Original line number Diff line number Diff line
@@ -170,18 +170,18 @@ static int af9033_rd_reg_mask(struct af9033_state *state, u32 reg, u8 *val, 
static int af9033_wr_reg_val_tab(struct af9033_state *state,

		const struct reg_val *tab, int tab_len)

{

#define MAX_TAB_LEN 212

	int ret, i, j;

	u8 buf[MAX_XFER_SIZE];

	u8 buf[1 + MAX_TAB_LEN];



	dev_dbg(&state->i2c->dev, "%s: tab_len=%d\n", __func__, tab_len);



	if (tab_len > sizeof(buf)) {

		dev_warn(&state->i2c->dev,

			 "%s: i2c wr len=%d is too big!\n",

		dev_warn(&state->i2c->dev, "%s: tab len %d is too big\n",

				KBUILD_MODNAME, tab_len);

		return -EINVAL;

	}



	dev_dbg(&state->i2c->dev, "%s: tab_len=%d\n", __func__, tab_len);



	for (i = 0, j = 0; i < tab_len; i++) {

		buf[j] = tab[i].val;

drivers/media/dvb-frontends/cxd2820r_c.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe) 


	num = if_freq / 1000; /* Hz => kHz */

	num *= 0x4000;

	if_ctl = cxd2820r_div_u64_round_closest(num, 41000);

	if_ctl = 0x4000 - cxd2820r_div_u64_round_closest(num, 41000);

	buf[0] = (if_ctl >> 8) & 0x3f;

	buf[1] = (if_ctl >> 0) & 0xff;

drivers/media/i2c/wm8775.c

+1 −3
Original line number Diff line number Diff line
@@ -130,12 +130,10 @@ static int wm8775_s_routing(struct v4l2_subdev *sd, 
		return -EINVAL;

	}

	state->input = input;

	if (!v4l2_ctrl_g_ctrl(state->mute))

	if (v4l2_ctrl_g_ctrl(state->mute))

		return 0;

	if (!v4l2_ctrl_g_ctrl(state->vol))

		return 0;

	if (!v4l2_ctrl_g_ctrl(state->bal))

		return 0;

	wm8775_set_audio(sd, 1);

	return 0;

}

drivers/media/pci/bt8xx/bttv-driver.c

+2 −1
Original line number Diff line number Diff line
@@ -4182,6 +4182,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) 
	}

	btv->std = V4L2_STD_PAL;

	init_irqreg(btv);

	if (!bttv_tvcards[btv->c.type].no_video)

		v4l2_ctrl_handler_setup(hdl);

	if (hdl->error) {

		result = hdl->error;