diff options
author | Wei Fang <wei.fang@nxp.com> | 2024-09-11 20:03:38 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2024-09-11 15:39:01 +0100 |
commit | a1d12410d9b1ecff87d39f80b0d1cec895012ffa (patch) | |
tree | 4dda8fe71da8d53abff710d74ef5fb9c5aab70f6 | |
parent | 5faf6daf659a83bd036190172eb17b1f9b3a0b01 (diff) | |
download | linux-stable-a1d12410d9b1ecff87d39f80b0d1cec895012ffa.tar.gz linux-stable-a1d12410d9b1ecff87d39f80b0d1cec895012ffa.tar.bz2 linux-stable-a1d12410d9b1ecff87d39f80b0d1cec895012ffa.zip |
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 <wei.fang@nxp.com>
Link: https://patch.msgid.link/20240911120338.526384-1-wei.fang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/regulator/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 835a5531d045..40dbff4017f5 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 */ |