diff options
| author | Kuninori Morimoto <morimoto.kuninori@renesas.com> | 2009-02-23 12:12:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:42:52 -0300 |
| commit | 66b46e68a52114e7065f0bfd0016276ae5925e70 (patch) | |
| tree | 0d03fb51da115f6c655bcaba334cb01bb57f7a6b /drivers/media/video/ov772x.c | |
| parent | cdce7c0be2b3377cc389dc03cc855f3d2e452df3 (diff) | |
| download | talos-op-linux-66b46e68a52114e7065f0bfd0016276ae5925e70.tar.gz talos-op-linux-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>
Diffstat (limited to 'drivers/media/video/ov772x.c')
| -rw-r--r-- | drivers/media/video/ov772x.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c index 702e61a9c02b..6b18da7c3c0a 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); } |
