diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-02-23 16:12:58 +0100 |
|---|---|---|
| committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-02-23 16:12:58 +0100 |
| commit | 9f4da9c7feb71ee575960553c4ad10555be64229 (patch) | |
| tree | f34458b634b2b572a01cf8717045c6374224792b /linux | |
| parent | 7c67818bb02d27076080edb44bbcb661e45fd2a5 (diff) | |
| download | mediapointer-dvb-s2-9f4da9c7feb71ee575960553c4ad10555be64229.tar.gz mediapointer-dvb-s2-9f4da9c7feb71ee575960553c4ad10555be64229.tar.bz2 | |
ov772x: bit mask operation fix on ov772x_mask_set.
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/ov772x.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/ov772x.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ov772x.c b/linux/drivers/media/video/ov772x.c index 211376a41..6e7cfeb18 100644 --- a/linux/drivers/media/video/ov772x.c +++ b/linux/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); } |