From: Mark Brown <broonie@kernel.org>
Date: Tue, 11 Apr 2017 20:31:40 +0000 (+0100)
Subject: regulator: core: Allow dummy regulators for supplies
X-Git-Tag: v4.12-rc1~111^2~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c93609ab3924cc974fc90001fb6aa250a8900a3c;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 3f424ec4fc56c..462e6e679ce1d 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1532,14 +1532,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
 	if (IS_ERR(r)) {
 		ret = PTR_ERR(r);
 
-		if (ret == -ENODEV) {
-			/*
-			 * No supply was specified for this regulator and
-			 * there will never be one.
-			 */
-			return 0;
-		}
-
 		/* Did the lookup explicitly defer for us? */
 		if (ret == -EPROBE_DEFER)
 			return ret;