scsi: ufs: Remove select of phy-qcom-ufs from ufs-qcom

[linux-2.6-block.git] / drivers / gpio / gpio-gpio-mm.c

diff --git a/drivers/gpio/gpio-gpio-mm.c b/drivers/gpio/gpio-gpio-mm.c
index b56ff2efbf3690129d3d781b5a39890e9c5d307d..8c150fd68d9d14fc84b2724c56c38bbcd657f16b 100644 (file)
--- 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;