diff options
| author | William Breathitt Gray <vilhelm.gray@gmail.com> | 2018-10-22 14:09:16 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2018-11-05 08:54:41 +0100 |
| commit | b7f53f67980e72da3317fffc160c746c02c23fb5 (patch) | |
| tree | 03989e3f9579bf15dc50d132bf2acef737d80a75 | |
| parent | gpio: 104-dio-48e: Mask read inputs for get_multiple (diff) | |
| download | linux-b7f53f67980e72da3317fffc160c746c02c23fb5.tar.xz linux-b7f53f67980e72da3317fffc160c746c02c23fb5.zip | |
gpio: 104-idi-48e: Mask the 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>
| -rw-r--r-- | drivers/gpio/gpio-104-idi-48.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c index 2c9738adb3a6..88dc6f2449f6 100644 --- a/drivers/gpio/gpio-104-idi-48.c +++ b/drivers/gpio/gpio-104-idi-48.c @@ -128,7 +128,7 @@ static int idi_48_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask, port_state = inb(idi48gpio->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; |