From: William Breathitt Gray Date: Mon, 22 Oct 2018 12:09:31 +0000 (+0900) Subject: gpio: gpio-mm: Mask read inputs for get_multiple X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3bfbc44029926e1bc4b89d16f562a364b2c9379e;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: William Breathitt Gray Signed-off-by: Linus Walleij --- 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;