Commit e0a8604f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Walleij

gpio: pca953x: Fix pca953x_gpio_set_multiple() on 64-bit

pca953x_gpio_set_multiple() divides by 4 to convert from longs to bytes,
which assumes a 32-bit platform, and is not correct on 64-bit platforms.
Use "sizeof(...)" instead to fix this.

Cc: stable@vger.kernel.org
Fixes: b4818afe ("gpio: pca953x: Add set_multiple to allow multiple bits to be set in one write.")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarPhil Reid <preid@electromag.com.au>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e5f7e312
...@@ -367,9 +367,11 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc, ...@@ -367,9 +367,11 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
memcpy(reg_val, chip->reg_output, NBANK(chip)); memcpy(reg_val, chip->reg_output, NBANK(chip));
mutex_lock(&chip->i2c_lock); mutex_lock(&chip->i2c_lock);
for(bank=0; bank<NBANK(chip); bank++) { for(bank=0; bank<NBANK(chip); bank++) {
unsigned bankmask = mask[bank/4] >> ((bank % 4) * 8); unsigned bankmask = mask[bank / sizeof(*mask)] >>
((bank % sizeof(*mask)) * 8);
if(bankmask) { if(bankmask) {
unsigned bankval = bits[bank/4] >> ((bank % 4) * 8); unsigned bankval = bits[bank / sizeof(*bits)] >>
((bank % sizeof(*bits)) * 8);
reg_val[bank] = (reg_val[bank] & ~bankmask) | bankval; reg_val[bank] = (reg_val[bank] & ~bankmask) | bankval;
} }
} }
......
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