diff options
| author | Joe Perches <joe@perches.com> | 2015-05-18 10:01:03 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-20 19:09:51 +0100 |
| commit | c53403a37cf083ce85da720f18918f73580d0064 (patch) | |
| tree | 448def944acb865f5f72a8244fb5e3ceef9e5ab1 /drivers/regulator/max77686.c | |
| parent | e4e8ccccf314eacc935e699073575de7816338e4 (diff) | |
| download | linux-c53403a37cf083ce85da720f18918f73580d0064.tar.gz linux-c53403a37cf083ce85da720f18918f73580d0064.tar.bz2 linux-c53403a37cf083ce85da720f18918f73580d0064.zip | |
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: 3307e9025d29 ("regulator: max77686: Add GPIO control")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/regulator/max77686.c')
| -rw-r--r-- | drivers/regulator/max77686.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index 23b7c06d30ba..17ccf365a9c0 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c @@ -88,7 +88,7 @@ enum max77686_ramp_rate { }; struct max77686_data { - u64 gpio_enabled:MAX77686_REGULATORS; + DECLARE_BITMAP(gpio_enabled, MAX77686_REGULATORS); /* Array indexed by regulator id */ unsigned int opmode[MAX77686_REGULATORS]; @@ -121,7 +121,7 @@ static unsigned int max77686_map_normal_mode(struct max77686_data *max77686, case MAX77686_BUCK8: case MAX77686_BUCK9: case MAX77686_LDO20 ... MAX77686_LDO22: - if (max77686->gpio_enabled & (1 << id)) + if (test_bit(id, max77686->gpio_enabled)) return MAX77686_GPIO_CONTROL; } @@ -277,7 +277,7 @@ static int max77686_of_parse_cb(struct device_node *np, } 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, desc->enable_mask, |