aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <morimoto.kuninori@renesas.com>2009-02-23 12:12:58 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:42:52 -0300
commit66b46e68a52114e7065f0bfd0016276ae5925e70 (patch)
tree0d03fb51da115f6c655bcaba334cb01bb57f7a6b
parentcdce7c0be2b3377cc389dc03cc855f3d2e452df3 (diff)
downloadmrst-s0i3-test-66b46e68a52114e7065f0bfd0016276ae5925e70.tar.gz
mrst-s0i3-test-66b46e68a52114e7065f0bfd0016276ae5925e70.tar.xz
mrst-s0i3-test-66b46e68a52114e7065f0bfd0016276ae5925e70.zip
V4L/DVB (10668): ov772x: bit mask operation fix on ov772x_mask_set.
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/ov772x.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index 702e61a9c02..6b18da7c3c0 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -565,8 +565,11 @@ static int ov772x_mask_set(struct i2c_client *client,
u8 set)
{
s32 val = i2c_smbus_read_byte_data(client, command);
+ if (val < 0)
+ return val;
+
val &= ~mask;
- val |= set;
+ val |= set & mask;
return i2c_smbus_write_byte_data(client, command, val);
}