Commit 3728e6a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
 "Core fixes:
   - cec: Respond to unregistered initiators, when applicable
   - dvb_frontend: only use kref after initialized

  Driver-specific fixes:
   - qcom, camss: Make function vfe_set_selection static
   - qcom: VIDEO_QCOM_CAMSS should depend on HAS_DMA
   - s5p-cec: add NACK detection support
   - media: staging/imx: Fix uninitialized variable warning
   - dib3000mc: i2c transfers over usb cannot be done from stack
   - venus: init registered list on streamoff"

* tag 'media/v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: dvb_frontend: only use kref after initialized
  media: platform: VIDEO_QCOM_CAMSS should depend on HAS_DMA
  media: cec: Respond to unregistered initiators, when applicable
  media: s5p-cec: add NACK detection support
  media: staging/imx: Fix uninitialized variable warning
  media: qcom: camss: Make function vfe_set_selection static
  media: venus: init registered list on streamoff
  media: dvb: i2c transfers over usb cannot be done from stack
parents 33d930e5 ead66600

drivers/media/cec/cec-adap.c

+10 −3
Original line number Diff line number Diff line
@@ -1797,12 +1797,19 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg, 
	 */

	switch (msg->msg[1]) {

	case CEC_MSG_GET_CEC_VERSION:

	case CEC_MSG_GIVE_DEVICE_VENDOR_ID:

	case CEC_MSG_ABORT:

	case CEC_MSG_GIVE_DEVICE_POWER_STATUS:

	case CEC_MSG_GIVE_PHYSICAL_ADDR:

	case CEC_MSG_GIVE_OSD_NAME:

		/*

		 * These messages reply with a directed message, so ignore if

		 * the initiator is Unregistered.

		 */

		if (!adap->passthrough && from_unregistered)

			return 0;

		/* Fall through */

	case CEC_MSG_GIVE_DEVICE_VENDOR_ID:

	case CEC_MSG_GIVE_FEATURES:

	case CEC_MSG_GIVE_PHYSICAL_ADDR:

		/*

		 * Skip processing these messages if the passthrough mode

		 * is on.
@@ -1810,7 +1817,7 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg, 
		if (adap->passthrough)

			goto skip_processing;

		/* Ignore if addressing is wrong */

		if (is_broadcast || from_unregistered)

		if (is_broadcast)

			return 0;

		break;

drivers/media/dvb-core/dvb_frontend.c

+21 −4
Original line number Diff line number Diff line
@@ -141,22 +141,39 @@ struct dvb_frontend_private { 
static void dvb_frontend_invoke_release(struct dvb_frontend *fe,

					void (*release)(struct dvb_frontend *fe));



static void dvb_frontend_free(struct kref *ref)

static void __dvb_frontend_free(struct dvb_frontend *fe)

{

	struct dvb_frontend *fe =

		container_of(ref, struct dvb_frontend, refcount);

	struct dvb_frontend_private *fepriv = fe->frontend_priv;



	if (!fepriv)

		return;



	dvb_free_device(fepriv->dvbdev);



	dvb_frontend_invoke_release(fe, fe->ops.release);



	kfree(fepriv);

	fe->frontend_priv = NULL;

}



static void dvb_frontend_free(struct kref *ref)

{

	struct dvb_frontend *fe =

		container_of(ref, struct dvb_frontend, refcount);



	__dvb_frontend_free(fe);

}



static void dvb_frontend_put(struct dvb_frontend *fe)

{

	/*

	 * Check if the frontend was registered, as otherwise

	 * kref was not initialized yet.

	 */

	if (fe->frontend_priv)

		kref_put(&fe->refcount, dvb_frontend_free);

	else

		__dvb_frontend_free(fe);

}



static void dvb_frontend_get(struct dvb_frontend *fe)

drivers/media/dvb-frontends/dib3000mc.c

+39 −11
Original line number Diff line number Diff line
@@ -55,29 +55,57 @@ struct dib3000mc_state { 


static u16 dib3000mc_read_word(struct dib3000mc_state *state, u16 reg)

{

	u8 wb[2] = { (reg >> 8) | 0x80, reg & 0xff };

	u8 rb[2];

	struct i2c_msg msg[2] = {

		{ .addr = state->i2c_addr >> 1, .flags = 0,        .buf = wb, .len = 2 },

		{ .addr = state->i2c_addr >> 1, .flags = I2C_M_RD, .buf = rb, .len = 2 },

		{ .addr = state->i2c_addr >> 1, .flags = 0,        .len = 2 },

		{ .addr = state->i2c_addr >> 1, .flags = I2C_M_RD, .len = 2 },

	};

	u16 word;

	u8 *b;



	b = kmalloc(4, GFP_KERNEL);

	if (!b)

		return 0;



	b[0] = (reg >> 8) | 0x80;

	b[1] = reg;

	b[2] = 0;

	b[3] = 0;



	msg[0].buf = b;

	msg[1].buf = b + 2;



	if (i2c_transfer(state->i2c_adap, msg, 2) != 2)

		dprintk("i2c read error on %d\n",reg);



	return (rb[0] << 8) | rb[1];

	word = (b[2] << 8) | b[3];

	kfree(b);



	return word;

}



static int dib3000mc_write_word(struct dib3000mc_state *state, u16 reg, u16 val)

{

	u8 b[4] = {

		(reg >> 8) & 0xff, reg & 0xff,

		(val >> 8) & 0xff, val & 0xff,

	};

	struct i2c_msg msg = {

		.addr = state->i2c_addr >> 1, .flags = 0, .buf = b, .len = 4

		.addr = state->i2c_addr >> 1, .flags = 0, .len = 4

	};

	return i2c_transfer(state->i2c_adap, &msg, 1) != 1 ? -EREMOTEIO : 0;

	int rc;

	u8 *b;



	b = kmalloc(4, GFP_KERNEL);

	if (!b)

		return -ENOMEM;



	b[0] = reg >> 8;

	b[1] = reg;

	b[2] = val >> 8;

	b[3] = val;



	msg.buf = b;



	rc = i2c_transfer(state->i2c_adap, &msg, 1) != 1 ? -EREMOTEIO : 0;

	kfree(b);



	return rc;

}



static int dib3000mc_identify(struct dib3000mc_state *state)

drivers/media/dvb-frontends/dvb-pll.c

+17 −5
Original line number Diff line number Diff line
@@ -753,13 +753,19 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, 
				    struct i2c_adapter *i2c,

				    unsigned int pll_desc_id)

{

	u8 b1 [] = { 0 };

	struct i2c_msg msg = { .addr = pll_addr, .flags = I2C_M_RD,

			       .buf = b1, .len = 1 };

	u8 *b1;

	struct i2c_msg msg = { .addr = pll_addr, .flags = I2C_M_RD, .len = 1 };

	struct dvb_pll_priv *priv = NULL;

	int ret;

	const struct dvb_pll_desc *desc;



	b1 = kmalloc(1, GFP_KERNEL);

	if (!b1)

		return NULL;



	b1[0] = 0;

	msg.buf = b1;



	if ((id[dvb_pll_devcount] > DVB_PLL_UNDEFINED) &&

	    (id[dvb_pll_devcount] < ARRAY_SIZE(pll_list)))

		pll_desc_id = id[dvb_pll_devcount];
@@ -773,15 +779,19 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, 
			fe->ops.i2c_gate_ctrl(fe, 1);



		ret = i2c_transfer (i2c, &msg, 1);

		if (ret != 1)

		if (ret != 1) {

			kfree(b1);

			return NULL;

		}

		if (fe->ops.i2c_gate_ctrl)

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

	}



	priv = kzalloc(sizeof(struct dvb_pll_priv), GFP_KERNEL);

	if (priv == NULL)

	if (!priv) {

		kfree(b1);

		return NULL;

	}



	priv->pll_i2c_address = pll_addr;

	priv->i2c = i2c;
@@ -811,6 +821,8 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, 
				"insmod option" : "autodetected");

	}



	kfree(b1);



	return fe;

}

EXPORT_SYMBOL(dvb_pll_attach);

drivers/media/platform/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ config VIDEO_PXA27x 


config VIDEO_QCOM_CAMSS

	tristate "Qualcomm 8x16 V4L2 Camera Subsystem driver"

	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API

	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA

	depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST

	select VIDEOBUF2_DMA_SG

	select V4L2_FWNODE

CRA Git | Maintained and supported by SUSTech CRA and CCSE