summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpio-104-dio-48e.c
diff options
context:
space:
mode:
authorWilliam Breathitt Gray <vilhelm.gray@gmail.com>2018-10-22 15:08:59 +0300
committerLinus Walleij <linus.walleij@linaro.org>2018-11-05 10:54:41 +0300
commitf90deea4a6615b7397c559565a4a4eb3ed98dd90 (patch)
treed81a2ac7f225c27ae28f80a8565cc6aa0660b598 /drivers/gpio/gpio-104-dio-48e.c
parent7ddb7dce0ab69aef140a0fb3034a07d356ad9252 (diff)
downloadlinux-f90deea4a6615b7397c559565a4a4eb3ed98dd90.tar.xz
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 <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-104-dio-48e.c')
-rw-r--r--drivers/gpio/gpio-104-dio-48e.c2
1 files changed, 1 insertions, 1 deletions
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;