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

torvalds · torvalds · commit ec1abfc83331 · 2025-08-29T07:37:21.000-07:00
Pull regulator fix from Mark Brown:
 "One simple fix for the pm8008 driver for poor error handling,
  switching to use a helper which does the right thing in the
  affected case"

* tag 'regulator-fix-v6.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: pm8008: fix probe failure due to negative voltage selector
diff --git a/drivers/regulator/qcom-pm8008-regulator.c b/drivers/regulator/qcom-pm8008-regulator.c
@@ -96,7 +96,7 @@ static int pm8008_regulator_get_voltage_sel(struct regulator_dev *rdev)
 
 	uV = le16_to_cpu(val) * 1000;
 
-	return (uV - preg->desc.min_uV) / preg->desc.uV_step;
+	return regulator_map_voltage_linear_range(rdev, uV, INT_MAX);
 }
 
 static const struct regulator_ops pm8008_regulator_ops = {

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static int pm8008_regulator_get_voltage_sel(struct regulator_dev *rdev)`
`96`	`96`
`97`	`97`	`uV = le16_to_cpu(val) * 1000;`
`98`	`98`
`99`		`- return (uV - preg->desc.min_uV) / preg->desc.uV_step;`
	`99`	`+ return regulator_map_voltage_linear_range(rdev, uV, INT_MAX);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`static const struct regulator_ops pm8008_regulator_ops = {`