Commit 1c0a21da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.6-rc2' of... 

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

Pull regulator fix from Mark Brown:
 "One fix for the tps6287x driver which was incorrectly specifying the
  field for voltage range selection leading to incorrect voltages being
  set"

* tag 'regulator-fix-v6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix voltage range selection
parents 2cf0f715 6223e073

drivers/regulator/helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ int regulator_set_voltage_sel_pickable_regmap(struct regulator_dev *rdev, 
	sel += rdev->desc->linear_ranges[i].min_sel;



	range = rdev->desc->linear_range_selectors_bitfield[i];

	range <<= ffs(rdev->desc->vsel_mask) - 1;

	range <<= ffs(rdev->desc->vsel_range_mask) - 1;



	if (rdev->desc->vsel_reg == rdev->desc->vsel_range_reg) {

		ret = regmap_update_bits(rdev->regmap,