Commit 4e2e9864 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

parents 1f93e4a9 23c3f310
...@@ -1394,6 +1394,7 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) ...@@ -1394,6 +1394,7 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
return 0; return 0;
r = regulator_dev_lookup(dev, rdev->supply_name, &ret); r = regulator_dev_lookup(dev, rdev->supply_name, &ret);
if (!r) {
if (ret == -ENODEV) { if (ret == -ENODEV) {
/* /*
* No supply was specified for this regulator and * No supply was specified for this regulator and
...@@ -1402,7 +1403,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) ...@@ -1402,7 +1403,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
return 0; return 0;
} }
if (!r) {
if (have_full_constraints()) { if (have_full_constraints()) {
r = dummy_regulator_rdev; r = dummy_regulator_rdev;
} else { } else {
...@@ -1422,10 +1422,9 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) ...@@ -1422,10 +1422,9 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
return ret; return ret;
/* Cascade always-on state to supply */ /* Cascade always-on state to supply */
if (_regulator_is_enabled(rdev)) { if (_regulator_is_enabled(rdev) && rdev->supply) {
ret = regulator_enable(rdev->supply); ret = regulator_enable(rdev->supply);
if (ret < 0) { if (ret < 0) {
if (rdev->supply)
_regulator_put(rdev->supply); _regulator_put(rdev->supply);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment