iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: core: fix error path for regulator_set_voltage_unlocked

Browse Source 
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: 9243a195be ("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>
This commit is contained in:
Steve Twiss
2019-03-18 16:17:57 +00:00
committed by Mark Brown
parent e5680c4de3
commit 70b464918e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/regulator/core.c
View File

@@ -3322,15 +3322,12 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
/* for not coupled regulators this will just set the voltage */ /* for not coupled regulators this will just set the voltage */
ret = regulator_balance_voltage(rdev, state); ret = regulator_balance_voltage(rdev, state);
if (ret < 0) if (ret < 0) {
goto out2; voltage->min_uV = old_min_uV;
voltage->max_uV = old_max_uV;
}
out: out:
return 0;
out2:
voltage->min_uV = old_min_uV;
voltage->max_uV = old_max_uV;
return ret; return ret;
} }