2022-12-14 02:00:15

by ChiYuan Huang

Subject: [PATCH] regulator: core: Fix resolve supply lookup issue

From: ChiYuan Huang <[email protected]>

From Marek's log, the previous change modify the parent of rdev.
https://lore.kernel.org/all/[email protected]/

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 <[email protected]>
Tested-by: Marek Szyprowski <[email protected]>
Signed-off-by: ChiYuan Huang <[email protected]>
---
drivers/regulator/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index ace4ecc..729c453 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -5540,7 +5540,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);
--
2.7.4

2022-12-14 15:57:42

by Mark Brown

Subject: Re: [PATCH] regulator: core: Fix resolve supply lookup issue

On Wed, 14 Dec 2022 09:37:11 +0800, cy_huang wrote:
> From Marek's log, the previous change modify the parent of rdev.
> https://lore.kernel.org/all/[email protected]/
>
> 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.
>
> [...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: core: Fix resolve supply lookup issue
commit: 0debed5b117d11e33cba52870c4dcb64f5911891

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark