Merge tag 'v3.4-rc2' into regulator-drivers

Linux 3.4-rc2 contains some fixes that further patches depend upon.

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 10c38f9ae787..c4a584c268ce 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -361,8 +361,7 @@ static int s5m8767_set_voltage(struct regulator_dev *rdev,
         struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
         const struct s5m_voltage_desc *desc;
         int reg_id = rdev_get_id(rdev);
-        int reg, mask, ret;
-        int i;
+        int sel, reg, mask, ret;
         u8 val;
 
         switch (reg_id) {
@@ -383,19 +382,20 @@ static int s5m8767_set_voltage(struct regulator_dev *rdev,
 
         desc = reg_voltage_map[reg_id];
 
-        i = s5m8767_convert_voltage_to_sel(desc, min_uV, max_uV);
-        if (i < 0)
-                return i;
+        sel = s5m8767_convert_voltage_to_sel(desc, min_uV, max_uV);
+        if (sel < 0)
+                return sel;
 
         ret = s5m8767_get_voltage_register(rdev, &reg);
         if (ret)
                 return ret;
 
         s5m_reg_read(s5m8767->iodev, reg, &val);
-        val = val & mask;
+        val &= ~mask;
+        val |= sel;
 
         ret = s5m_reg_write(s5m8767->iodev, reg, val);
-        *selector = i;
+        *selector = sel;
 
         return ret;
 }