---

yaml --- r: 220639 b: refs/heads/master c: 25d9507 h: refs/heads/master i: 220637: cd897b4 220635: a3782e4 220631: 1bff609 220623: b1ece32 220607: ba3a120 v: v3
git-mirror · Oct 28, 2010 · d8977f4 · d8977f4
1 parent b9f3eff
commit d8977f4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1558b51eb7c813b3d90bdd68057403f7cac191fa
+refs/heads/master: 25d950714781f34e7ae1292f38889cf39983cb38
diff --git a/trunk/drivers/mfd/max8998.c b/trunk/drivers/mfd/max8998.c
@@ -110,8 +110,6 @@ int max8998_update_reg(struct i2c_client *i2c, u8 reg, u8 val, u8 mask)
 		u8 old_val = ret & 0xff;
 		u8 new_val = (val & mask) | (old_val & (~mask));
 		ret = i2c_smbus_write_byte_data(i2c, reg, new_val);
-		if (ret >= 0)
-			ret = 0;
 	}
 	mutex_unlock(&max8998->iolock);
 	return ret;