---

yaml --- r: 137939 b: refs/heads/master c: 66b46e6 h: refs/heads/master i: 137937: 58827f4 137935: 3758088 v: v3
git-mirror · Mar 30, 2009 · b282e85 · b282e85
1 parent 6e564a4
commit b282e85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdce7c0be2b3377cc389dc03cc855f3d2e452df3
+refs/heads/master: 66b46e68a52114e7065f0bfd0016276ae5925e70
diff --git a/trunk/drivers/media/video/ov772x.c b/trunk/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);
 }