Merge "regulator: core: Fix voltage change propagations to supply regulators" into dev/msm-4.4-8996au

This commit is contained in:
Linux Build Service Account 2017-04-05 03:45:46 -07:00 committed by Gerrit - the friendly Code Review server
commit e9ffd2832d

View file

@ -2931,7 +2931,8 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
goto out2;
if (rdev->supply && (rdev->desc->min_dropout_uV ||
!rdev->desc->ops->get_voltage)) {
!(rdev->desc->ops->get_voltage ||
rdev->desc->ops->get_voltage_sel))) {
int current_supply_uV;
int selector;