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

ec1abfc8 · Linus Torvalds <[email protected]> · 2025-08-29 07:37:21 -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

Commit: ec1abfc8333110b9e645cd59eb3bc0541fd5bd2c
Parents: 2bd37315 · ef3e9c91

Merge commit. Changes below are compared with the first parent: 2bd37315.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/regulator/qcom-pm8008-regulator.c	modified	+1	−1	View file

drivers/regulator/qcom-pm8008-regulator.c

View file

diff --git a/drivers/regulator/qcom-pm8008-regulator.c b/drivers/regulator/qcom-pm8008-regulator.c
index da017c1..90c78ee 100644
--- 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 = {