1 files changed, 35 insertions, 27 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 1f9ff55b3620..f28c133693ad 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2348,6 +2348,40 @@ static int _regulator_is_enabled(struct regulator_dev *rdev)
         return rdev->desc->ops->is_enabled(rdev);
 }
 
+static int _regulator_list_voltage(struct regulator *regulator,
+                                    unsigned selector, int lock)
+{
+        struct regulator_dev *rdev = regulator->rdev;
+        const struct regulator_ops *ops = rdev->desc->ops;
+        int ret;
+
+        if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1 && !selector)
+                return rdev->desc->fixed_uV;
+
+        if (ops->list_voltage) {
+                if (selector >= rdev->desc->n_voltages)
+                        return -EINVAL;
+                if (lock)
+                        mutex_lock(&rdev->mutex);
+                ret = ops->list_voltage(rdev, selector);
+                if (lock)
+                        mutex_unlock(&rdev->mutex);
+        } else if (rdev->supply) {
+                ret = _regulator_list_voltage(rdev->supply, selector, lock);
+        } else {
+                return -EINVAL;
+        }
+
+        if (ret > 0) {
+                if (ret < rdev->constraints->min_uV)
+                        ret = 0;
+                else if (ret > rdev->constraints->max_uV)
+                        ret = 0;
+        }
+
+        return ret;
+}
+
 /**
  * regulator_is_enabled - is the regulator output enabled
  * @regulator: regulator source
@@ -2437,33 +2471,7 @@ EXPORT_SYMBOL_GPL(regulator_count_voltages);
  */
 int regulator_list_voltage(struct regulator *regulator, unsigned selector)
 {
-        struct regulator_dev *rdev = regulator->rdev;
-        const struct regulator_ops *ops = rdev->desc->ops;
-        int ret;
-
-        if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1 && !selector)
-                return rdev->desc->fixed_uV;
-
-        if (ops->list_voltage) {
-                if (selector >= rdev->desc->n_voltages)
-                        return -EINVAL;
-                mutex_lock(&rdev->mutex);
-                ret = ops->list_voltage(rdev, selector);
-                mutex_unlock(&rdev->mutex);
-        } else if (rdev->supply) {
-                ret = regulator_list_voltage(rdev->supply, selector);
-        } else {
-                return -EINVAL;
-        }
-
-        if (ret > 0) {
-                if (ret < rdev->constraints->min_uV)
-                        ret = 0;
-                else if (ret > rdev->constraints->max_uV)
-                        ret = 0;
-        }
-
-        return ret;
+        return _regulator_list_voltage(regulator, selector, 1);
 }
 EXPORT_SYMBOL_GPL(regulator_list_voltage);