diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-06-07 17:08:21 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-08 07:30:04 +0800 |
| commit | 999f0c7cb8e7c378bd1f3fcd56cf8dc5a30c83e4 (patch) | |
| tree | 3e9f4c196441a8e8860295e3a811f299af19450d /drivers/regulator/palmas-regulator.c | |
| parent | 1acb645ebfe3a008e3c3350918d7d29974b1eaec (diff) | |
| download | kernel_goldelico_gta04-999f0c7cb8e7c378bd1f3fcd56cf8dc5a30c83e4.zip kernel_goldelico_gta04-999f0c7cb8e7c378bd1f3fcd56cf8dc5a30c83e4.tar.gz kernel_goldelico_gta04-999f0c7cb8e7c378bd1f3fcd56cf8dc5a30c83e4.tar.bz2 | |
regulator: palmas: Clear PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK bits in palmas_set_mode_smps
Current code actually clears more bits than PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK bits.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Graeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/palmas-regulator.c')
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index b4e10b0..1a0924d 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -257,8 +257,7 @@ static int palmas_set_mode_smps(struct regulator_dev *dev, unsigned int mode) unsigned int reg; palmas_smps_read(pmic->palmas, palmas_regs_info[id].ctrl_addr, ®); - reg &= ~PALMAS_SMPS12_CTRL_STATUS_MASK; - reg >>= PALMAS_SMPS12_CTRL_STATUS_SHIFT; + reg &= ~PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; switch (mode) { case REGULATOR_MODE_NORMAL: |