diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-04-13 09:35:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-16 05:19:30 -0400 |
commit | 3f24f5ada638dd07705bd83ebcc80044d587f374 (patch) | |
tree | 1b01b7577a164ee9abaa87b59870bbc7d1a126d1 /drivers/regulator/core.c | |
parent | eba41a5e8c9473c24c333df288d4fd6a40e98464 (diff) |
regulator: core: Fix getting input_uV when supplied by another regulator
When supplied by another regulator, returns the supply regulator's output
voltage for inpu_uV.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/core.c')
-rw-r--r-- | drivers/regulator/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index d4d34cbd34d9..713981b52f2a 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -649,7 +649,7 @@ static void drms_uA_update(struct regulator_dev *rdev) | |||
649 | /* get input voltage */ | 649 | /* get input voltage */ |
650 | input_uV = 0; | 650 | input_uV = 0; |
651 | if (rdev->supply) | 651 | if (rdev->supply) |
652 | input_uV = _regulator_get_voltage(rdev); | 652 | input_uV = regulator_get_voltage(rdev->supply); |
653 | if (input_uV <= 0) | 653 | if (input_uV <= 0) |
654 | input_uV = rdev->constraints->input_uV; | 654 | input_uV = rdev->constraints->input_uV; |
655 | if (input_uV <= 0) | 655 | if (input_uV <= 0) |