From: Wei Fang Date: Wed, 11 Sep 2024 12:03:38 +0000 (+0800) Subject: regulator: core: fix the broken behavior of regulator_dev_lookup() X-Git-Tag: v6.12-rc1~190^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1d12410d9b1ecff87d39f80b0d1cec895012ffa;p=thirdparty%2Fkernel%2Flinux.git regulator: core: fix the broken behavior of regulator_dev_lookup() The behavior of regulator_dev_lookup() for non-DT way has been broken since the commit b8c325545714 ("regulator: Move OF-specific regulator lookup code to of_regulator.c"). Before the commit, of_get_regulator() was used to get the regulator, which returns NULL if the regulator is not found. So the regulator will be looked up through regulator_lookup_by_name() if no matching regulator is found in regulator_map_list. However, currently, of_regulator_dev_lookup() is used to instead of of_get_regulator(), but the variable 'r' is set to ERR_PTR(-ENODEV) instead of NULL if the regulator is not found. In this case, if no regulator is found in regulator_map_list, the variable 'r' is still ERR_PTR(-ENODEV), So regulator_dev_lookup() returns the value of 'r' directly instead of continuing to look up the regulator through regulator_lookup_by_name(). Fixes: b8c325545714 ("regulator: Move OF-specific regulator lookup code to of_regulator.c") Signed-off-by: Wei Fang Link: https://patch.msgid.link/20240911120338.526384-1-wei.fang@nxp.com Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 835a5531d0458..40dbff4017f5f 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1965,6 +1965,9 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev, return r; if (PTR_ERR(r) == -EPROBE_DEFER) return r; + + if (PTR_ERR(r) == -ENODEV) + r = NULL; } /* if not found, try doing it non-dt way */