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

torvalds · torvalds · commit 3df82e4201f5 · 2023-03-31T13:02:34.000-07:00
Pull regulator fix from Mark Brown:
 "Deferred probe fix for v6.3.

  This fixes a rarely triggered issue where we would treat probe
  deferral for clocks as a fatal error in the fixed regulator, causing
  it to fail to retry when it should"

* tag 'regulator-fix-v6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Handle deferred clk
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
@@ -215,7 +215,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
 		drvdata->enable_clock = devm_clk_get(dev, NULL);
 		if (IS_ERR(drvdata->enable_clock)) {
 			dev_err(dev, "Can't get enable-clock from devicetree\n");
-			return -ENOENT;
+			return PTR_ERR(drvdata->enable_clock);
 		}
 	} else if (drvtype && drvtype->has_performance_state) {
 		drvdata->desc.ops = &fixed_voltage_domain_ops;

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)`
`215`	`215`	`drvdata->enable_clock = devm_clk_get(dev, NULL);`
`216`	`216`	`if (IS_ERR(drvdata->enable_clock)) {`
`217`	`217`	`dev_err(dev, "Can't get enable-clock from devicetree\n");`
`218`		`- return -ENOENT;`
	`218`	`+ return PTR_ERR(drvdata->enable_clock);`
`219`	`219`	`}`
`220`	`220`	`} else if (drvtype && drvtype->has_performance_state) {`
`221`	`221`	`drvdata->desc.ops = &fixed_voltage_domain_ops;`