diff options
| author | William Breathitt Gray <[email protected]> | 2018-10-22 12:09:31 +0000 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2018-11-05 07:54:41 +0000 |
| commit | 3bfbc44029926e1bc4b89d16f562a364b2c9379e (patch) | |
| tree | ffaa4604501edeee53858bd1555bc59340503507 | |
| parent | gpio: 104-idi-48e: Mask the read inputs for get_multiple (diff) | |
| download | kernel-3bfbc44029926e1bc4b89d16f562a364b2c9379e.tar.gz kernel-3bfbc44029926e1bc4b89d16f562a364b2c9379e.zip | |
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 <[email protected]>
Signed-off-by: William Breathitt Gray <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
| -rw-r--r-- | drivers/gpio/gpio-gpio-mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |