Skip to content

Commit 57c045b

Browse files
AxelLinbroonie
authored andcommitted
regulator: hi6421v600: Fix setting idle mode
commit db27f82 changed eco_mode << (ffs(sreg->eco_mode_mask) - 1) to sreg->eco_mode_mask << (ffs(sreg->eco_mode_mask) - 1) which is wrong. Fix it by simply set val = sreg->eco_mode_mask. In additional, sreg->eco_mode_mask can be 0 (LDO3, LDO33, LDO34). Return -EINVAL if idle mode is not supported when sreg->eco_mode_mask is 0. While at it, also use unsigned int for reg_val/val which is the expected type for regmap_read and regmap_update_bits. Fixes: db27f82 ("staging: regulator: hi6421v600-regulator: use shorter names for OF properties") Signed-off-by: Axel Lin <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 01c5741 commit 57c045b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/regulator/hi6421v600-regulator.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev)
117117
static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
118118
{
119119
struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
120-
u32 reg_val;
120+
unsigned int reg_val;
121121

122122
regmap_read(rdev->regmap, rdev->desc->enable_reg, &reg_val);
123123

@@ -131,14 +131,17 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev,
131131
unsigned int mode)
132132
{
133133
struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
134-
u32 val;
134+
unsigned int val;
135135

136136
switch (mode) {
137137
case REGULATOR_MODE_NORMAL:
138138
val = 0;
139139
break;
140140
case REGULATOR_MODE_IDLE:
141-
val = sreg->eco_mode_mask << (ffs(sreg->eco_mode_mask) - 1);
141+
if (!sreg->eco_mode_mask)
142+
return -EINVAL;
143+
144+
val = sreg->eco_mode_mask;
142145
break;
143146
default:
144147
return -EINVAL;

0 commit comments

Comments
 (0)