Merge tag 'v3.5-rc7' into regulator-drivers

Linux 3.5-rc7

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 8d81bafcb721..08ccf03f1dd8 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2636,9 +2636,12 @@ int regulator_set_optimum_mode(struct regulator *regulator, int uA_load)
 {
         struct regulator_dev *rdev = regulator->rdev;
         struct regulator *consumer;
-        int ret, output_uV, input_uV, total_uA_load = 0;
+        int ret, output_uV, input_uV = 0, total_uA_load = 0;
         unsigned int mode;
 
+        if (rdev->supply)
+                input_uV = regulator_get_voltage(rdev->supply);
+
         mutex_lock(&rdev->mutex);
 
         /*
@@ -2671,10 +2674,7 @@ int regulator_set_optimum_mode(struct regulator *regulator, int uA_load)
                 goto out;
         }
 
-        /* get input voltage */
-        input_uV = 0;
-        if (rdev->supply)
-                input_uV = regulator_get_voltage(rdev->supply);
+        /* No supply? Use constraint voltage */
         if (input_uV <= 0)
                 input_uV = rdev->constraints->input_uV;
         if (input_uV <= 0) {