Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
This commit is contained in:
commit
6710f22343
@ -1403,6 +1403,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Did the lookup explicitly defer for us? */
|
||||||
|
if (ret == -EPROBE_DEFER)
|
||||||
|
return ret;
|
||||||
|
|
||||||
if (have_full_constraints()) {
|
if (have_full_constraints()) {
|
||||||
r = dummy_regulator_rdev;
|
r = dummy_regulator_rdev;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user