Unverified Commit 70b46491 authored Mar 18, 2019 by Steve Twiss Committed by Mark Brown Mar 19, 2019

regulator: core: fix error path for regulator_set_voltage_unlocked



During several error paths in the function
regulator_set_voltage_unlocked() the value of 'ret' can take on negative
error values. However, in calls that go through the 'goto out' statement,
this return value is lost and return 0 is used instead, indicating a
'pass'.

There are several cases where this function should legitimately return a
fail instead of a pass: one such case includes constraints check during
voltage selection in the call to regulator_check_voltage(), which can
have -EINVAL for the case when an unsupported voltage is incorrectly
requested. In that case, -22 is expected as the return value, not 0.

Fixes: 9243a195 ("regulator: core: Change voltage setting path")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent e5680c4d

drivers/regulator/core.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -3322,15 +3322,12 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,

		/* for not coupled regulators this will just set the voltage */
		ret = regulator_balance_voltage(rdev, state);
		if (ret < 0)
		goto out2;

		out:
		return 0;
		out2:
		if (ret < 0) {
		voltage->min_uV = old_min_uV;
		voltage->max_uV = old_max_uV;
		}

		out:
		return ret;
		}

Admin message