diff options
-rw-r--r-- | drivers/regulator/core.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 58452ac0f165..7287000595e5 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2097,16 +2097,26 @@ int regulator_set_optimum_mode(struct regulator *regulator, int uA_load) mutex_lock(&rdev->mutex); + /* + * first check to see if we can set modes at all, otherwise just + * tell the consumer everything is OK. + */ regulator->uA_load = uA_load; ret = regulator_check_drms(rdev); - if (ret < 0) + if (ret < 0) { + ret = 0; goto out; - ret = -EINVAL; + } - /* sanity check */ if (!rdev->desc->ops->get_optimum_mode) goto out; + /* + * we can actually do this so any errors are indicators of + * potential real failure. + */ + ret = -EINVAL; + /* get output voltage */ output_uV = _regulator_get_voltage(rdev); if (output_uV <= 0) { |