diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:38:20 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:38:20 -0400 |
| commit | c592c761a36286ab83451daa37a21c8558ea99c0 (patch) | |
| tree | 8abf57708fabf2a915320e9515b1ae2730ebf499 /drivers/regulator/max8649.c | |
| parent | 63236f4038f7e14762114606d95769c32cf6cac1 (diff) | |
| parent | 33499df88b711725ee473ab5478e17efd21de4b0 (diff) | |
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) | |||
| 149 | if (ret != 0) | 149 | if (ret != 0) |
| 150 | return ret; | 150 | return ret; |
| 151 | val &= MAX8649_VOL_MASK; | 151 | val &= MAX8649_VOL_MASK; |
| 152 | voltage = max8649_list_voltage(rdev, (unsigned char)ret); /* uV */ | 152 | voltage = max8649_list_voltage(rdev, (unsigned char)val); /* uV */ |
| 153 | 153 | ||
| 154 | /* get rate */ | 154 | /* get rate */ |
| 155 | ret = regmap_read(info->regmap, MAX8649_RAMP, &val); | 155 | ret = regmap_read(info->regmap, MAX8649_RAMP, &val); |