1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 8dc3ec79a06f..0558b22fd3fb 100644
--- a/drivers/media/video/tw9910.c
+++ b/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);
 }