diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-05 01:40:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-05 01:40:19 -0700 |
| commit | 4380bdb60482f651edfa6d54e7641b7aad65a252 (patch) | |
| tree | a7923074944dff08fe45f509e1c4946abd36c0c7 | |
| parent | c8b2f82770195df8dbeb50c1979188a9f4fee5df (diff) | |
| parent | dbb187f1404afe5055a123ffc2a65ff4458dc766 (diff) | |
Merge "regulator: spm-regulator: Fix the usage of the 'uV' variable" into dev/msm-4.4-8996au
| -rw-r--r-- | drivers/regulator/spm-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/spm-regulator.c b/drivers/regulator/spm-regulator.c index 11d4d7650fde..c24c32b0ce19 100644 --- a/drivers/regulator/spm-regulator.c +++ b/drivers/regulator/spm-regulator.c @@ -302,14 +302,14 @@ static int spm_regulator_write_voltage(struct spm_vreg *vreg, int uV) if (uV > vreg->last_set_uV) { /* Wait for voltage stepping to complete. */ - slew_delay = DIV_ROUND_UP(vreg->uV - vreg->last_set_uV, + slew_delay = DIV_ROUND_UP(uV - vreg->last_set_uV, vreg->step_rate); if (vreg->regulator_type == QPNP_TYPE_FTS2p5) slew_delay += FTS2P5_SETTLING_DELAY_US; udelay(slew_delay); } else if (vreg->regulator_type == QPNP_TYPE_FTS2p5) { /* add the ramp-down delay */ - slew_delay = DIV_ROUND_UP(vreg->last_set_uV - vreg->uV, + slew_delay = DIV_ROUND_UP(vreg->last_set_uV - uV, vreg->step_rate) + FTS2P5_SETTLING_DELAY_US; udelay(slew_delay); } |