Commit 4b0755e9 authored May 04, 2017 by Philipp Zabel Committed by Mauro Carvalho Chehab Jun 06, 2017

[media] tc358743: fix register i2c_rd/wr function fix



The below mentioned fix contains a small but severe bug,
fix it to make the driver work again.

Fixes: 3538aa6e ("[media] tc358743: fix register i2c_rd/wr functions")

Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent 963761a0

drivers/media/i2c/tc358743.c

+1 −1

Original line number	Original line	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,		static void i2c_wr8_and_or(struct v4l2_subdev *sd, u16 reg,
	u8 mask, u8 val)		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)		static u16 i2c_rd16(struct v4l2_subdev *sd, u16 reg)