Merge remote-tracking branch 'regulator/topic/core' into regulator-next

1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index d70f00f8fc66..4f0198a2524a 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1439,9 +1439,9 @@ EXPORT_SYMBOL_GPL(regulator_get);
  *
  * Returns a struct regulator corresponding to the regulator producer,
  * or IS_ERR() condition containing errno.  Other consumers will be
- * unable to obtain this reference is held and the use count for the
- * regulator will be initialised to reflect the current state of the
- * regulator.
+ * unable to obtain this regulator while this reference is held and the
+ * use count for the regulator will be initialised to reflect the current
+ * state of the regulator.
  *
  * This is intended for use by consumers which cannot tolerate shared
  * use of the regulator such as those which need to force the
@@ -1465,10 +1465,7 @@ EXPORT_SYMBOL_GPL(regulator_get_exclusive);
  * @id: Supply name or regulator ID.
  *
  * Returns a struct regulator corresponding to the regulator producer,
- * or IS_ERR() condition containing errno.  Other consumers will be
- * unable to obtain this reference is held and the use count for the
- * regulator will be initialised to reflect the current state of the
- * regulator.
+ * or IS_ERR() condition containing errno.
  *
  * This is intended for use by consumers for devices which can have
  * some supplies unconnected in normal use, such as some MMC devices.
@@ -1606,9 +1603,10 @@ EXPORT_SYMBOL_GPL(regulator_unregister_supply_alias);
  * registered any aliases that were registered will be removed
  * before returning to the caller.
  */
-int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
+int regulator_bulk_register_supply_alias(struct device *dev,
+                                         const char *const *id,
                                          struct device *alias_dev,
-                                         const char **alias_id,
+                                         const char *const *alias_id,
                                          int num_id)
 {
         int i;
@@ -1646,7 +1644,7 @@ EXPORT_SYMBOL_GPL(regulator_bulk_register_supply_alias);
  * aliases in one operation.
  */
 void regulator_bulk_unregister_supply_alias(struct device *dev,
-                                            const char **id,
+                                            const char *const *id,
                                             int num_id)
 {
         int i;
@@ -2330,6 +2328,10 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
                             regulator_list_voltage_linear)
                                 ret = regulator_map_voltage_linear(rdev,
                                                                 min_uV, max_uV);
+                        else if (rdev->desc->ops->list_voltage ==
+                                 regulator_list_voltage_linear_range)
+                                ret = regulator_map_voltage_linear_range(rdev,
+                                                                min_uV, max_uV);
                         else
                                 ret = regulator_map_voltage_iterate(rdev,
                                                                 min_uV, max_uV);