1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index da357a07c98..2ff76349f39 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -709,8 +709,12 @@ static int set_machine_constraints(struct regulator_dev *rdev,
                         cmax = INT_MAX;
                 }
 
+                /* voltage constraints are optional */
+                if ((cmin == 0) && (cmax == 0))
+                        goto out;
+
                 /* else require explicit machine-level constraints */
-                else if (cmin <= 0 || cmax <= 0 || cmax < cmin) {
+                if (cmin <= 0 || cmax <= 0 || cmax < cmin) {
                         pr_err("%s: %s '%s' voltage constraints\n",
                                        __func__, "invalid", name);
                         ret = -EINVAL;