---

yaml --- r: 261603 b: refs/heads/master c: 9c56cbf h: refs/heads/master i: 261601: db70afe 261599: edc0e6a v: v3
git-mirror · Jul 27, 2011 · 79970cf · 79970cf
1 parent 45c01e5
commit 79970cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b52a851d9182e8a20704152d537c7e19ed34cc99
+refs/heads/master: 9c56cbf9aadff79c25ccd424ae422971efd5c1a4
diff --git a/trunk/drivers/media/video/mt9m111.c b/trunk/drivers/media/video/mt9m111.c
@@ -250,7 +250,9 @@ static int mt9m111_reg_clear(struct i2c_client *client, const u16 reg,
 	int ret;
 
 	ret = mt9m111_reg_read(client, reg);
-	return mt9m111_reg_write(client, reg, ret & ~data);
+	if (ret >= 0)
+		ret = mt9m111_reg_write(client, reg, ret & ~data);
+	return ret;
 }
 
 static int mt9m111_set_context(struct mt9m111 *mt9m111,