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

Commit 906e0c5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media fixes from Mauro Carvalho Chehab:

 - some build dependency issues at CEC core with randconfigs

 - fix an off by one error at vb2

 - a race fix at cec core

 - driver fixes at tc358743, sir_ir and rainshadow-cec

* tag 'media/v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] media/cec.h: use IS_REACHABLE instead of IS_ENABLED
  [media] cec: race fix: don't return -ENONET in cec_receive()
  [media] sir_ir: infinite loop in interrupt handler
  [media] cec-notifier.h: handle unreachable CONFIG_CEC_CORE
  [media] cec: improve MEDIA_CEC_RC dependencies
  [media] vb2: Fix an off by one error in 'vb2_plane_vaddr'
  [media] rainshadow-cec: Fix missing spin_lock_init()
  [media] tc358743: fix register i2c_rd/wr function fix
parents 63f700aa f9f314f3

drivers/media/cec/Kconfig

+1 −0
Original line number Diff line number Diff line 
config MEDIA_CEC_RC

	bool "HDMI CEC RC integration"

	depends on CEC_CORE && RC_CORE

	depends on CEC_CORE=m || RC_CORE=y

	---help---

	  Pass on CEC remote control messages to the RC framework.

drivers/media/cec/cec-api.c

+1 −7
Original line number Diff line number Diff line
@@ -271,16 +271,10 @@ static long cec_receive(struct cec_adapter *adap, struct cec_fh *fh, 
			bool block, struct cec_msg __user *parg)

{

	struct cec_msg msg = {};

	long err = 0;

	long err;



	if (copy_from_user(&msg, parg, sizeof(msg)))

		return -EFAULT;

	mutex_lock(&adap->lock);

	if (!adap->is_configured && fh->mode_follower < CEC_MODE_MONITOR)

		err = -ENONET;

	mutex_unlock(&adap->lock);

	if (err)

		return err;



	err = cec_receive_msg(fh, &msg, block);

	if (err)

drivers/media/i2c/tc358743.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static void i2c_wr8(struct v4l2_subdev *sd, u16 reg, u8 val) 
static void i2c_wr8_and_or(struct v4l2_subdev *sd, u16 reg,

		u8 mask, u8 val)

{

	i2c_wrreg(sd, reg, (i2c_rdreg(sd, reg, 2) & mask) | val, 2);

	i2c_wrreg(sd, reg, (i2c_rdreg(sd, reg, 1) & mask) | val, 1);

}



static u16 i2c_rd16(struct v4l2_subdev *sd, u16 reg)

drivers/media/rc/sir_ir.c

+6 −0
Original line number Diff line number Diff line
@@ -183,9 +183,15 @@ static irqreturn_t sir_interrupt(int irq, void *dev_id) 
	static unsigned long delt;

	unsigned long deltintr;

	unsigned long flags;

	int counter = 0;

	int iir, lsr;



	while ((iir = inb(io + UART_IIR) & UART_IIR_ID)) {

		if (++counter > 256) {

			dev_err(&sir_ir_dev->dev, "Trapped in interrupt");

			break;

		}



		switch (iir & UART_IIR_ID) { /* FIXME toto treba preriedit */

		case UART_IIR_MSI:

			(void)inb(io + UART_MSR);

drivers/media/usb/rainshadow-cec/rainshadow-cec.c

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static int rain_connect(struct serio *serio, struct serio_driver *drv) 
	serio_set_drvdata(serio, rain);

	INIT_WORK(&rain->work, rain_irq_work_handler);

	mutex_init(&rain->write_lock);

	spin_lock_init(&rain->buf_lock);



	err = serio_open(serio, drv);

	if (err)