Skip to content

Commit

Permalink
regulator: Fix setting new voltage in s5m8767_set_voltage
Browse files Browse the repository at this point in the history
Current code does not really update the register with new value, fix it.
I rename the variable i to sel for better readability.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Mar 31, 2012
1 parent 5f12760 commit 546e784
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/regulator/s5m8767.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,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) {
Expand All @@ -333,19 +332,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;
}
Expand Down

0 comments on commit 546e784

Please sign in to comment.