Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index c0d9ae8d0860..9fecbd4e3546 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;