From: William Breathitt Gray Date: Mon, 22 Oct 2018 12:08:59 +0000 (+0900) Subject: gpio: 104-dio-48e: Mask read inputs for get_multiple X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f90deea4a6615b7397c559565a4a4eb3ed98dd90;p=openwrt%2Fstaging%2Fblogic.git gpio: 104-dio-48e: 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-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c index 9c4e07fcb74b..92c8f944bf64 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -222,7 +222,7 @@ static int dio48e_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask, port_state = inb(dio48egpio->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;