summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-02-07 04:12:55 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-10 12:20:55 +0100
commit9fc886a1880766fb91cb27c2e96bd814cef640d6 (patch)
treec1df712e6fd407ba4baf2bb91984aefecaee7f60 /drivers/regulator
parentregulator: Fix mc13xxx regulator modular build (again) (diff)
downloadlinux-9fc886a1880766fb91cb27c2e96bd814cef640d6.tar.xz
linux-9fc886a1880766fb91cb27c2e96bd814cef640d6.zip
regulator: Fix getting voltage in max8649_enable_time()
Current code takes wrong parameter while calling max8649_list_voltage. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max8649.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index b06a2399587c..d0e1180ad961 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -150,7 +150,7 @@ static int max8649_enable_time(struct regulator_dev *rdev)
if (ret != 0)
return ret;
val &= MAX8649_VOL_MASK;
- voltage = max8649_list_voltage(rdev, (unsigned char)ret); /* uV */
+ voltage = max8649_list_voltage(rdev, (unsigned char)val); /* uV */
/* get rate */
ret = regmap_read(info->regmap, MAX8649_RAMP, &val);