summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-pci-idio-16.c
diff options
context:
space:
mode:
authorWilliam Breathitt Gray <vilhelm.gray@gmail.com>2018-10-22 14:10:06 +0200
committerLinus Walleij <linus.walleij@linaro.org>2018-11-05 08:54:42 +0100
commitf837bf6acaf54aa8b3a09378f5c8ec1ca2cd3338 (patch)
tree1e9599acecc31744b22de6b88a3b93e4084efad7 /drivers/gpio/gpio-pci-idio-16.c
parentgpio: ws16c48: Mask read inputs for get_multiple (diff)
downloadlinux-f837bf6acaf54aa8b3a09378f5c8ec1ca2cd3338.tar.xz
linux-f837bf6acaf54aa8b3a09378f5c8ec1ca2cd3338.zip
gpio: pci-idio-16: 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-pci-idio-16.c')
-rw-r--r--drivers/gpio/gpio-pci-idio-16.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-pci-idio-16.c b/drivers/gpio/gpio-pci-idio-16.c
index 25d16b2af1c3..6b7349783223 100644
--- a/drivers/gpio/gpio-pci-idio-16.c
+++ b/drivers/gpio/gpio-pci-idio-16.c
@@ -146,7 +146,7 @@ static int idio_16_gpio_get_multiple(struct gpio_chip *chip,
port_state = ioread8(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;