mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
regulator: core: don't return error with inadequate reason
drms_uA_update() always returns failure when it cannot find regulator's input voltage. But if hardware supports load configuration with ops->set_load() and the input regulator isn't specified with valid reason such as the input regulator is battery, not finding input voltage is normal so such case should not return with an error. Avoid such inadequate error return by checking input/output voltages only when drms_uA_update() is about to configure load with enum based ops->set_mode(). Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
29b4817d40
commit
577766175c
1 changed files with 18 additions and 18 deletions
|
@ -679,24 +679,6 @@ static int drms_uA_update(struct regulator_dev *rdev)
|
||||||
!rdev->desc->ops->set_load)
|
!rdev->desc->ops->set_load)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* get output voltage */
|
|
||||||
output_uV = _regulator_get_voltage(rdev);
|
|
||||||
if (output_uV <= 0) {
|
|
||||||
rdev_err(rdev, "invalid output voltage found\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* get input voltage */
|
|
||||||
input_uV = 0;
|
|
||||||
if (rdev->supply)
|
|
||||||
input_uV = regulator_get_voltage(rdev->supply);
|
|
||||||
if (input_uV <= 0)
|
|
||||||
input_uV = rdev->constraints->input_uV;
|
|
||||||
if (input_uV <= 0) {
|
|
||||||
rdev_err(rdev, "invalid input voltage found\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* calc total requested load */
|
/* calc total requested load */
|
||||||
list_for_each_entry(sibling, &rdev->consumer_list, list)
|
list_for_each_entry(sibling, &rdev->consumer_list, list)
|
||||||
current_uA += sibling->uA_load;
|
current_uA += sibling->uA_load;
|
||||||
|
@ -709,6 +691,24 @@ static int drms_uA_update(struct regulator_dev *rdev)
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
rdev_err(rdev, "failed to set load %d\n", current_uA);
|
rdev_err(rdev, "failed to set load %d\n", current_uA);
|
||||||
} else {
|
} else {
|
||||||
|
/* get output voltage */
|
||||||
|
output_uV = _regulator_get_voltage(rdev);
|
||||||
|
if (output_uV <= 0) {
|
||||||
|
rdev_err(rdev, "invalid output voltage found\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* get input voltage */
|
||||||
|
input_uV = 0;
|
||||||
|
if (rdev->supply)
|
||||||
|
input_uV = regulator_get_voltage(rdev->supply);
|
||||||
|
if (input_uV <= 0)
|
||||||
|
input_uV = rdev->constraints->input_uV;
|
||||||
|
if (input_uV <= 0) {
|
||||||
|
rdev_err(rdev, "invalid input voltage found\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
/* now get the optimum mode for our new total regulator load */
|
/* now get the optimum mode for our new total regulator load */
|
||||||
mode = rdev->desc->ops->get_optimum_mode(rdev, input_uV,
|
mode = rdev->desc->ops->get_optimum_mode(rdev, input_uV,
|
||||||
output_uV, current_uA);
|
output_uV, current_uA);
|
||||||
|
|
Loading…
Reference in a new issue