From: Mark Brown Date: Thu, 1 Oct 2015 09:59:48 +0000 (+0100) Subject: regulator: core: Handle probe deferral from DT when resolving supplies X-Git-Tag: v4.3-rc5~27^2~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06423121d9eba0a56b9341cf82b88479017bce14;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git regulator: core: Handle probe deferral from DT when resolving supplies When resolving regulator-regulator supplies we ignore probe deferral returns from regulator_dev_lookup() (such as are generated for DT when we can see a supply is registered) and just fall back to the dummy regulator if there are full constraints (as is the case for DT). This means that probe deferral is broken for DT systems, fix that by paying attention to -EPROBE_DEFER return codes like we do -ENODEV. A further patch will simplify this further, this is a minimal fix for the specific issue. Fixes: 9f7e25edb1575a6d2 (regulator: core: Handle full constraints systems when resolving supplies) Reported-by: Sascha Hauer Tested-by: Sascha Hauer Signed-off-by: Mark Brown Cc: stable@vger.kernel.org --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 7849187..8a34f6a 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1403,6 +1403,10 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) return 0; } + /* Did the lookup explicitly defer for us? */ + if (ret == -EPROBE_DEFER) + return ret; + if (have_full_constraints()) { r = dummy_regulator_rdev; } else {