From d8977f4db1329ecacc4f531dcba7fa55fba56f39 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 22 Oct 2010 08:30:26 +0800
Subject: [PATCH] --- yaml --- r: 220639 b: refs/heads/master c:
 25d950714781f34e7ae1292f38889cf39983cb38 h: refs/heads/master i:   220637:
 cd897b4c4a55e90c5b04c121939cce1b2c56b130   220635:
 a3782e417cb221526cbd32e7c96f829b7c5964ff   220631:
 1bff609e343cc1bc45617e2672fc0a53e309df1c   220623:
 b1ece32603953586a36e039134745021896df109   220607:
 ba3a12000247dc09dd220f33ca5e050d7baaf193 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mfd/max8998.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8a5872560a90..44e7c9c555f4 100644
--- 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
index a720f412cd15..06ddf741d4c7 100644
--- 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;