From b282e85a390525b3aa9cb9ed197746572599948a Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Date: Mon, 23 Feb 2009 12:12:58 -0300
Subject: [PATCH] --- yaml --- r: 137939 b: refs/heads/master c:
 66b46e68a52114e7065f0bfd0016276ae5925e70 h: refs/heads/master i:   137937:
 58827f471abd6ae39958bcf17c1eef92b2b7975c   137935:
 37580886e234057e7c7a6f1f605ffd913fab5658 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/media/video/ov772x.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 68ebca77d4a9..e04bb4124d86 100644
--- 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
index 702e61a9c02b..6b18da7c3c0a 100644
--- 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);
 }