From: Steve Twiss stwiss.opensource@diasemi.com
commit 70b464918e5331e488058870fcc6821d54c4e541 upstream.
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: 9243a195be7a ("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 Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
--- drivers/regulator/core.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
--- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3360,15 +3360,12 @@ static int regulator_set_voltage_unlocke
/* for not coupled regulators this will just set the voltage */ ret = regulator_balance_voltage(rdev, state); - if (ret < 0) - goto out2; + if (ret < 0) { + voltage->min_uV = old_min_uV; + voltage->max_uV = old_max_uV; + }
out: - return 0; -out2: - voltage->min_uV = old_min_uV; - voltage->max_uV = old_max_uV; - return ret; }