From: ChiYuan Huang Date: Wed, 14 Dec 2022 01:37:11 +0000 (+0800) Subject: regulator: core: Fix resolve supply lookup issue X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=65a1a20caf72328541cea3f557fe5d87c8ef54eb;p=users%2Fjedix%2Flinux-maple.git 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 Tested-by: Marek Szyprowski Signed-off-by: ChiYuan Huang Link: https://lore.kernel.org/r/1670981831-12583-1-git-send-email-u0084500@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- 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 = ®ulator_class; - rdev->dev.parent = dev; + rdev->dev.parent = config->dev; dev_set_name(&rdev->dev, "regulator.%lu", (unsigned long) atomic_inc_return(®ulator_no)); dev_set_drvdata(&rdev->dev, rdev);