diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-20 09:26:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-20 09:26:42 -0700 |
| commit | 1c0a21da7a1c648c327cf7cdf16feceb087892e6 (patch) | |
| tree | 47b82ecceeb2b52145be1de101d25859a5826a92 | |
| parent | Merge tag 'nfs-for-6.6-2' of git://git.linux-nfs.org/projects/anna/linux-nfs (diff) | |
| parent | regulator: Fix voltage range selection (diff) | |
| download | wireguard-linux-1c0a21da7a1c648c327cf7cdf16feceb087892e6.tar.xz wireguard-linux-1c0a21da7a1c648c327cf7cdf16feceb087892e6.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | drivers/regulator/helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c index 5ad5f3b3a6b5..d49268336553 100644 --- a/drivers/regulator/helpers.c +++ b/drivers/regulator/helpers.c @@ -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, |