提交 762e6acf 编写于 作者: D Dmitry Baryshkov 提交者: Wang ShaoBo

regulator: core: resolve supply for boot-on/always-on regulators

stable inclusion
from stable-v5.10.44
commit 06653ebc0ad2e0b7d799cd71a5c2933ed2fb7a66
bugzilla: https://bugzilla.openeuler.org/show_bug.cgi?id=351
CVE: NA

-------------------------------------------------

commit 98e48cd9 upstream.

For the boot-on/always-on regulators the set_machine_constrainst() is
called before resolving rdev->supply. Thus the code would try to enable
rdev before enabling supplying regulator. Enforce resolving supply
regulator before enabling rdev.

Fixes: aea6cb99 ("regulator: resolve supply after creating regulator")
Signed-off-by: NDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20210519221224.2868496-1-dmitry.baryshkov@linaro.orgSigned-off-by: NMark Brown <broonie@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ngpj <572192972@qq.com>
Reviewed-by: Jian Cheng <cj.chengjian(a)huawei.com>
上级 d84eb507
...@@ -1422,6 +1422,12 @@ static int set_machine_constraints(struct regulator_dev *rdev) ...@@ -1422,6 +1422,12 @@ static int set_machine_constraints(struct regulator_dev *rdev)
* and we have control then make sure it is enabled. * and we have control then make sure it is enabled.
*/ */
if (rdev->constraints->always_on || rdev->constraints->boot_on) { if (rdev->constraints->always_on || rdev->constraints->boot_on) {
/* If we want to enable this regulator, make sure that we know
* the supplying regulator.
*/
if (rdev->supply_name && !rdev->supply)
return -EPROBE_DEFER;
if (rdev->supply) { if (rdev->supply) {
ret = regulator_enable(rdev->supply); ret = regulator_enable(rdev->supply);
if (ret < 0) { if (ret < 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册