Merge remote-tracking branch 'regulator/topic/core' into regulator-next

[sfrench/cifs-2.6.git] / drivers / regulator / core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index f8e76f73da35a1bfe5e353d484c6360f12204226..e9f74331fc697d86b723e1a69379d636c9fe9162 100644 (file)
--- 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;