---

yaml --- r: 140259 b: refs/heads/master c: 3e2b9ab h: refs/heads/master i: 140257: 14a91f3 140255: 2f53ad9 v: v3
git-mirror · Mar 31, 2009 · b1b51d1 · b1b51d1
1 parent ea34edc
commit b1b51d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;