mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
This commit is contained in:
commit
9ef6d2e0fa
1 changed files with 2 additions and 1 deletions
|
@ -2938,7 +2938,8 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
|
||||||
if (rdev->supply &&
|
if (rdev->supply &&
|
||||||
regulator_ops_is_valid(rdev->supply->rdev,
|
regulator_ops_is_valid(rdev->supply->rdev,
|
||||||
REGULATOR_CHANGE_VOLTAGE) &&
|
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 current_supply_uV;
|
||||||
int selector;
|
int selector;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue