summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorChiYuan Huang <cy_huang@richtek.com>2022-12-14 04:37:11 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-12-31 15:33:05 +0300
commit65a1a20caf72328541cea3f557fe5d87c8ef54eb (patch)
tree2b9145be6ca3d3b6c5617030018051fba4c1f596 /drivers/regulator
parent077bff242c13c372d2bd5c44c521d6852df6caf9 (diff)
downloadlinux-65a1a20caf72328541cea3f557fe5d87c8ef54eb.tar.xz
regulator: core: Fix resolve supply lookup issue
[ Upstream commit 0debed5b117d11e33cba52870c4dcb64f5911891 ] From Marek's log, the previous change modify the parent of rdev. https://lore.kernel.org/all/58b92e75-f373-dae7-7031-8abd465bb874@samsung.com/ In 'regulator_resolve_supply', it uses the parent DT node of rdev as the DT-lookup starting node. But the parent DT node may not exist. This will cause the NULL supply issue. This patch modify the parent of rdev back to the device that provides from 'regulator_config' in 'regulator_register'. Fixes: 8f3cbcd6b440 ("regulator: core: Use different devices for resource allocation and DT lookup") Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> Link: https://lore.kernel.org/r/1670981831-12583-1-git-send-email-u0084500@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 8b567664f812..8e83a20a7e2e 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -5534,7 +5534,7 @@ regulator_register(struct device *dev,
/* register with sysfs */
rdev->dev.class = &regulator_class;
- rdev->dev.parent = dev;
+ rdev->dev.parent = config->dev;
dev_set_name(&rdev->dev, "regulator.%lu",
(unsigned long) atomic_inc_return(&regulator_no));
dev_set_drvdata(&rdev->dev, rdev);