diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 22:38:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 22:38:20 +0100 |
| commit | c592c761a36286ab83451daa37a21c8558ea99c0 (patch) | |
| tree | 8abf57708fabf2a915320e9515b1ae2730ebf499 /drivers/regulator/max8649.c | |
| parent | Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next (diff) | |
| parent | ARM i.MX 3ds debugboard: register a dummy regulator for the smsc911x device (diff) | |
| download | linux-c592c761a36286ab83451daa37a21c8558ea99c0.tar.xz linux-c592c761a36286ab83451daa37a21c8558ea99c0.zip | |
Merge remote-tracking branch 'regulator/topic/stub' into regulator-next
Diffstat (limited to 'drivers/regulator/max8649.c')
| -rw-r--r-- | drivers/regulator/max8649.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index 82505fcb8d43..824c650436ed 100644 --- a/drivers/regulator/max8649.c +++ b/drivers/regulator/max8649.c @@ -149,7 +149,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); |