summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/regulator/core.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 08bdb1e4175e..fd8da369c052 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2282,28 +2282,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
/* rdev->supply was created in set_supply() */
link_and_create_debugfs(rdev->supply, r, &rdev->dev);
- /*
- * In set_machine_constraints() we may have turned this regulator on
- * but we couldn't propagate to the supply if it hadn't been resolved
- * yet. Do it now.
- */
- if (rdev->use_count) {
- ret = regulator_enable(rdev->supply);
- if (ret < 0) {
- struct regulator *supply;
-
- regulator_lock_two(rdev, rdev->supply->rdev, &ww_ctx);
-
- supply = rdev->supply;
- rdev->supply = NULL;
-
- regulator_unlock_two(rdev, supply->rdev, &ww_ctx);
-
- regulator_put(supply);
- goto out;
- }
- }
-
out:
return ret;
}