aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-04-11 16:31:40 -0400
committerMark Brown <broonie@kernel.org>2017-04-14 13:08:01 -0400
commitc93609ab3924cc974fc90001fb6aa250a8900a3c (patch)
treeaddfda28969852502bfae40fe6f64669b9bb4914
parent43fc99f293cc802866bea904ca2f1f8573f236f7 (diff)
regulator: core: Allow dummy regulators for supplies
Rather than just not resolving the supply when there is explicitly no supply mapping fall through and allow a dummy supply to be substituted. This fixes issues with constant retries reported by Dong Aisheng. Signed-off-by: Mark Brown <broonie@kernel.org> Tested-by: Dong Aisheng <aisheng.dong@nxp.com> Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
-rw-r--r--drivers/regulator/core.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 3f424ec4fc56..462e6e679ce1 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1532,14 +1532,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
1532 if (IS_ERR(r)) { 1532 if (IS_ERR(r)) {
1533 ret = PTR_ERR(r); 1533 ret = PTR_ERR(r);
1534 1534
1535 if (ret == -ENODEV) {
1536 /*
1537 * No supply was specified for this regulator and
1538 * there will never be one.
1539 */
1540 return 0;
1541 }
1542
1543 /* Did the lookup explicitly defer for us? */ 1535 /* Did the lookup explicitly defer for us? */
1544 if (ret == -EPROBE_DEFER) 1536 if (ret == -EPROBE_DEFER)
1545 return ret; 1537 return ret;