Commit 3e2b9abd authored Mar 10, 2009 by Mark Brown Committed by Liam Girdwood Mar 31, 2009

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>

parent 216765d9

drivers/regulator/core.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -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;