diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-24 16:19:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-24 16:19:25 +0100 |
| commit | 7055a3145402bb3296cd98895da68462778f8b18 (patch) | |
| tree | 7a58c47452fe475302b95b13d0d81bb81df720e2 | |
| parent | Linux 4.2-rc3 (diff) | |
| parent | regulator: core: Handle full constraints systems when resolving supplies (diff) | |
| download | linux-7055a3145402bb3296cd98895da68462778f8b18.tar.gz linux-7055a3145402bb3296cd98895da68462778f8b18.zip | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
| -rw-r--r-- | drivers/regulator/core.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index c9f72019bd68..bb8528dfad8c 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1381,9 +1381,13 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) } if (!r) { - dev_err(dev, "Failed to resolve %s-supply for %s\n", - rdev->supply_name, rdev->desc->name); - return -EPROBE_DEFER; + if (have_full_constraints()) { + r = dummy_regulator_rdev; + } else { + dev_err(dev, "Failed to resolve %s-supply for %s\n", + rdev->supply_name, rdev->desc->name); + return -EPROBE_DEFER; + } } /* Recursively resolve the supply of the supply */ |