tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'regulator-fix-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
"Two core fixes here, one for a long standing race which some Qualcomm
systems have started triggering with their UFS driver and another
fixing a problem with supply lookup introduced by the fixes for devm
related use after free issues that were introduced in this merge
window"

* tag 'regulator-fix-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: core: fix deadlock on regulator enable
regulator: core: Fix resolve supply lookup issue

Linus Torvalds 0a023cbb 2c91ce92

+2 -2
+2 -2
drivers/regulator/core.c
··· 1002 1002 /* get input voltage */ 1003 1003 input_uV = 0; 1004 1004 if (rdev->supply) 1005 - input_uV = regulator_get_voltage(rdev->supply); 1005 + input_uV = regulator_get_voltage_rdev(rdev->supply->rdev); 1006 1006 if (input_uV <= 0) 1007 1007 input_uV = rdev->constraints->input_uV; 1008 1008 ··· 5540 5540 5541 5541 /* register with sysfs */ 5542 5542 rdev->dev.class = &regulator_class; 5543 - rdev->dev.parent = dev; 5543 + rdev->dev.parent = config->dev; 5544 5544 dev_set_name(&rdev->dev, "regulator.%lu", 5545 5545 (unsigned long) atomic_inc_return(&regulator_no)); 5546 5546 dev_set_drvdata(&rdev->dev, rdev);