|
@@ -953,6 +953,8 @@ static int machine_constraints_current(struct regulator_dev *rdev,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int _regulator_do_enable(struct regulator_dev *rdev);
|
|
|
+
|
|
|
/**
|
|
|
* set_machine_constraints - sets regulator constraints
|
|
|
* @rdev: regulator source
|
|
@@ -1013,10 +1015,9 @@ static int set_machine_constraints(struct regulator_dev *rdev,
|
|
|
/* If the constraints say the regulator should be on at this point
|
|
|
* and we have control then make sure it is enabled.
|
|
|
*/
|
|
|
- if ((rdev->constraints->always_on || rdev->constraints->boot_on) &&
|
|
|
- ops->enable) {
|
|
|
- ret = ops->enable(rdev);
|
|
|
- if (ret < 0) {
|
|
|
+ if (rdev->constraints->always_on || rdev->constraints->boot_on) {
|
|
|
+ ret = _regulator_do_enable(rdev);
|
|
|
+ if (ret < 0 && ret != -EINVAL) {
|
|
|
rdev_err(rdev, "failed to enable\n");
|
|
|
goto out;
|
|
|
}
|
|
@@ -3626,9 +3627,8 @@ int regulator_suspend_finish(void)
|
|
|
struct regulator_ops *ops = rdev->desc->ops;
|
|
|
|
|
|
mutex_lock(&rdev->mutex);
|
|
|
- if ((rdev->use_count > 0 || rdev->constraints->always_on) &&
|
|
|
- ops->enable) {
|
|
|
- error = ops->enable(rdev);
|
|
|
+ if (rdev->use_count > 0 || rdev->constraints->always_on) {
|
|
|
+ error = _regulator_do_enable(rdev);
|
|
|
if (error)
|
|
|
ret = error;
|
|
|
} else {
|