Commit ec1abfc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.17-rc3' of... 

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

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
parents 2bd37315 ef3e9c91

drivers/regulator/qcom-pm8008-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {