| From 4b0755e90ae03ba40174842af6fa810355960fbc Mon Sep 17 00:00:00 2001 |
| From: Philipp Zabel <p.zabel@pengutronix.de> |
| Date: Thu, 4 May 2017 12:20:17 -0300 |
| Subject: [media] tc358743: fix register i2c_rd/wr function fix |
| |
| From: Philipp Zabel <p.zabel@pengutronix.de> |
| |
| commit 4b0755e90ae03ba40174842af6fa810355960fbc upstream. |
| |
| The below mentioned fix contains a small but severe bug, |
| fix it to make the driver work again. |
| |
| Fixes: 3538aa6ecfb2 ("[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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/media/i2c/tc358743.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/media/i2c/tc358743.c |
| +++ b/drivers/media/i2c/tc358743.c |
| @@ -241,7 +241,7 @@ static void i2c_wr16(struct v4l2_subdev |
| |
| static void i2c_wr16_and_or(struct v4l2_subdev *sd, u16 reg, u16 mask, u16 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 u32 i2c_rd32(struct v4l2_subdev *sd, u16 reg) |
