diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-01-16 12:57:27 -0800 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2013-01-16 12:58:11 -0800 |
| commit | 725f5f801458bda3b664686dea6127650829a5af (patch) | |
| tree | 9dca5675ff93755fb87ffc99cffe95e96c17bac9 /drivers/regulator | |
| parent | e687119f9ec43837ad610d41574dbda473355a1e (diff) | |
| parent | fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe (diff) | |
| download | kernel_samsung_tuna-725f5f801458bda3b664686dea6127650829a5af.tar.gz kernel_samsung_tuna-725f5f801458bda3b664686dea6127650829a5af.tar.bz2 kernel_samsung_tuna-725f5f801458bda3b664686dea6127650829a5af.zip | |
Merge branch 'android-3.0' into android-omap-3.0
Fixup incompatible code in opp.c: omap_init_opp_table()
Change-Id: Iac7d60b814a539285d00e0a3dbb6e3f0060cb683
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/max8997.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index ad6628ca94f..a8fb668c03a 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997.c @@ -688,7 +688,7 @@ static int max8997_set_voltage_buck(struct regulator_dev *rdev, } new_val++; - } while (desc->min + desc->step + new_val <= desc->max); + } while (desc->min + desc->step * new_val <= desc->max); new_idx = tmp_idx; new_val = tmp_val; |