Commit c53403a3 authored by Joe Perches's avatar Joe Perches Committed by Mark Brown

regulator: max77686: fix gpio_enabled shift wrapping bug

The code should handle more than 32 bits here because "id"
can be a value up to MAX77686_REGULATORS (currently 34).

Convert the gpio_enabled type to DECLARE_BITMAP and use
test_bit/set_bit.

Fixes: 3307e902 ("regulator: max77686: Add GPIO control")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent e4e8cccc
...@@ -88,7 +88,7 @@ enum max77686_ramp_rate { ...@@ -88,7 +88,7 @@ enum max77686_ramp_rate {
}; };
struct max77686_data { struct max77686_data {
u64 gpio_enabled:MAX77686_REGULATORS; DECLARE_BITMAP(gpio_enabled, MAX77686_REGULATORS);
/* Array indexed by regulator id */ /* Array indexed by regulator id */
unsigned int opmode[MAX77686_REGULATORS]; unsigned int opmode[MAX77686_REGULATORS];
...@@ -121,7 +121,7 @@ static unsigned int max77686_map_normal_mode(struct max77686_data *max77686, ...@@ -121,7 +121,7 @@ static unsigned int max77686_map_normal_mode(struct max77686_data *max77686,
case MAX77686_BUCK8: case MAX77686_BUCK8:
case MAX77686_BUCK9: case MAX77686_BUCK9:
case MAX77686_LDO20 ... MAX77686_LDO22: case MAX77686_LDO20 ... MAX77686_LDO22:
if (max77686->gpio_enabled & (1 << id)) if (test_bit(id, max77686->gpio_enabled))
return MAX77686_GPIO_CONTROL; return MAX77686_GPIO_CONTROL;
} }
...@@ -277,7 +277,7 @@ static int max77686_of_parse_cb(struct device_node *np, ...@@ -277,7 +277,7 @@ static int max77686_of_parse_cb(struct device_node *np,
} }
if (gpio_is_valid(config->ena_gpio)) { if (gpio_is_valid(config->ena_gpio)) {
max77686->gpio_enabled |= (1 << desc->id); set_bit(desc->id, max77686->gpio_enabled);
return regmap_update_bits(config->regmap, desc->enable_reg, return regmap_update_bits(config->regmap, desc->enable_reg,
desc->enable_mask, desc->enable_mask,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment