summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-gpio-mm.c
diff options
context:
space:
mode:
authorWilliam Breathitt Gray <vilhelm.gray@gmail.com>2018-10-22 21:09:31 +0900
committerLinus Walleij <linus.walleij@linaro.org>2018-11-05 08:54:41 +0100
commit3bfbc44029926e1bc4b89d16f562a364b2c9379e (patch)
treeffaa4604501edeee53858bd1555bc59340503507 /drivers/gpio/gpio-gpio-mm.c
parentb7f53f67980e72da3317fffc160c746c02c23fb5 (diff)
gpio: gpio-mm: Mask read inputs for get_multiple
This patch masks the read inputs with the word mask in order to ensure only requested input states are returned in the bits array. Suggested-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-gpio-mm.c')
-rw-r--r--drivers/gpio/gpio-gpio-mm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-gpio-mm.c b/drivers/gpio/gpio-gpio-mm.c
index b56ff2efbf36..8c150fd68d9d 100644
--- a/drivers/gpio/gpio-gpio-mm.c
+++ b/drivers/gpio/gpio-gpio-mm.c
@@ -211,7 +211,7 @@ static int gpiomm_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,
port_state = inb(gpiommgpio->base + ports[i]);
/* store acquired bits at respective bits array offset */
- bits[word_index] |= port_state << word_offset;
+ bits[word_index] |= (port_state << word_offset) & word_mask;
}
return 0;