summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-ws16c48.c
diff options
context:
space:
mode:
authorWilliam Breathitt Gray <vilhelm.gray@gmail.com>2018-10-22 21:09:49 +0900
committerLinus Walleij <linus.walleij@linaro.org>2018-11-05 08:54:42 +0100
commit7a702691d0ceb1a3a2199a1c7a15ddb5fbb50b7d (patch)
tree33a0271ad92bb55428770510fa9dddb8dfd4a740 /drivers/gpio/gpio-ws16c48.c
parent3bfbc44029926e1bc4b89d16f562a364b2c9379e (diff)
downloadlinux-stable-7a702691d0ceb1a3a2199a1c7a15ddb5fbb50b7d.tar.gz
linux-stable-7a702691d0ceb1a3a2199a1c7a15ddb5fbb50b7d.tar.bz2
linux-stable-7a702691d0ceb1a3a2199a1c7a15ddb5fbb50b7d.zip
gpio: ws16c48: 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-ws16c48.c')
-rw-r--r--drivers/gpio/gpio-ws16c48.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c
index c7028eb0b8e1..5cf3697bfb15 100644
--- a/drivers/gpio/gpio-ws16c48.c
+++ b/drivers/gpio/gpio-ws16c48.c
@@ -169,7 +169,7 @@ static int ws16c48_gpio_get_multiple(struct gpio_chip *chip,
port_state = inb(ws16c48gpio->base + 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;