regulator: Don't warn on omitted voltage constraints

Specifying voltage constraints is optional (and only needed if the
consumer is allowed to change the voltage) so don't complain unless
a voltage has been specified.

Also avoid surprises with a dangling else while we're here.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Mark Brown 2009-03-10 16:28:36 +00:00 committed by Liam Girdwood
parent 216765d92a
commit 3e2b9abda5
1 changed files with 5 additions and 1 deletions

View File

@ -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;