summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tw9910.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/tw9910.c')
-rw-r--r--linux/drivers/media/video/tw9910.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tw9910.c b/linux/drivers/media/video/tw9910.c
index 4593cdea7..ed8dca3bf 100644
--- a/linux/drivers/media/video/tw9910.c
+++ b/linux/drivers/media/video/tw9910.c
@@ -460,9 +460,11 @@ static int tw9910_mask_set(struct i2c_client *client, u8 command,
u8 mask, 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);
}