diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-03 16:52:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-03 16:52:14 +0100 |
| commit | 9ef6d2e0fac8fc9d899a9e07eda555792757b854 (patch) | |
| tree | 4abec516a5199a75fb0d96b67be765c651c50f6c | |
| parent | 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c (diff) | |
| parent | 2c2874b191d54fbf9216524e629558eee89e1d20 (diff) | |
| download | linux-9ef6d2e0fac8fc9d899a9e07eda555792757b854.tar.gz | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
| -rw-r--r-- | drivers/regulator/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index c0d9ae8d0860e8..9fecbd4e3546ae 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2938,7 +2938,8 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, if (rdev->supply && regulator_ops_is_valid(rdev->supply->rdev, REGULATOR_CHANGE_VOLTAGE) && - (rdev->desc->min_dropout_uV || !rdev->desc->ops->get_voltage)) { + (rdev->desc->min_dropout_uV || !(rdev->desc->ops->get_voltage || + rdev->desc->ops->get_voltage_sel))) { int current_supply_uV; int selector; |