diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-21 14:15:58 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-21 14:15:58 -0700 |
| commit | 4e2e986473f708be46bd00007621f97178bd7047 (patch) | |
| tree | 35525e14215d6f9eb0628fe51aef72f489d1688c | |
| parent | 1f93e4a96c9109378204c147b3eec0d0e8100fde (diff) | |
| parent | 23c3f310e897837aeb8ffe8700b803cb58e7b35d (diff) | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
| -rw-r--r-- | drivers/regulator/core.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 7a85ac9e32c5..7849187d91ae 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1394,15 +1394,15 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) return 0; r = regulator_dev_lookup(dev, rdev->supply_name, &ret); - if (ret == -ENODEV) { - /* - * No supply was specified for this regulator and - * there will never be one. - */ - return 0; - } - if (!r) { + if (ret == -ENODEV) { + /* + * No supply was specified for this regulator and + * there will never be one. + */ + return 0; + } + if (have_full_constraints()) { r = dummy_regulator_rdev; } else { @@ -1422,11 +1422,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) return ret; /* Cascade always-on state to supply */ - if (_regulator_is_enabled(rdev)) { + if (_regulator_is_enabled(rdev) && rdev->supply) { ret = regulator_enable(rdev->supply); if (ret < 0) { - if (rdev->supply) - _regulator_put(rdev->supply); + _regulator_put(rdev->supply); return ret; } } |