From b1b51d1fd8a449cfa0d60372d7d6e4291205fbe0 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 10 Mar 2009 16:28:36 +0000
Subject: [PATCH] --- yaml --- r: 140259 b: refs/heads/master c:
 3e2b9abda554e9f6105996dca77cca9ef98de17a h: refs/heads/master i:   140257:
 14a91f3ac64f483876f4f9f05e94fb345047a20b   140255:
 2f53ad9b78a70138010955e055b8278207fce553 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/regulator/core.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9f2462d964c9..4602516e5608 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 216765d92acaeabdad6561254a5a676325105a37
+refs/heads/master: 3e2b9abda554e9f6105996dca77cca9ef98de17a
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index da357a07c98e..2ff76349f392 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/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;