|
@@ -844,13 +844,22 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,
|
|
|
/* do we need to apply the constraint voltage */
|
|
|
if (rdev->constraints->apply_uV &&
|
|
|
rdev->constraints->min_uV == rdev->constraints->max_uV) {
|
|
|
- ret = _regulator_do_set_voltage(rdev,
|
|
|
- rdev->constraints->min_uV,
|
|
|
- rdev->constraints->max_uV);
|
|
|
- if (ret < 0) {
|
|
|
- rdev_err(rdev, "failed to apply %duV constraint\n",
|
|
|
- rdev->constraints->min_uV);
|
|
|
- return ret;
|
|
|
+ int current_uV = _regulator_get_voltage(rdev);
|
|
|
+ if (current_uV < 0) {
|
|
|
+ rdev_err(rdev, "failed to get the current voltage\n");
|
|
|
+ return current_uV;
|
|
|
+ }
|
|
|
+ if (current_uV < rdev->constraints->min_uV ||
|
|
|
+ current_uV > rdev->constraints->max_uV) {
|
|
|
+ ret = _regulator_do_set_voltage(
|
|
|
+ rdev, rdev->constraints->min_uV,
|
|
|
+ rdev->constraints->max_uV);
|
|
|
+ if (ret < 0) {
|
|
|
+ rdev_err(rdev,
|
|
|
+ "failed to apply %duV constraint\n",
|
|
|
+ rdev->constraints->min_uV);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|