5 files changed, 9 insertions, 10 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d011cb89d25e..ed37e5908b91 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -22,10 +22,6 @@ menuconfig GPIOLIB
 
 if GPIOLIB
 
-config GPIO_DEVRES
-        def_bool y
-        depends on HAS_IOMEM
-
 config OF_GPIO
         def_bool y
         depends on OF
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index ab28a2daeacc..d074c2299393 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -2,7 +2,7 @@
 
 ccflags-$(CONFIG_DEBUG_GPIO)    += -DDEBUG
 
-obj-$(CONFIG_GPIO_DEVRES)       += devres.o
+obj-$(CONFIG_GPIOLIB)           += devres.o
 obj-$(CONFIG_GPIOLIB)           += gpiolib.o
 obj-$(CONFIG_GPIOLIB)           += gpiolib-legacy.o
 obj-$(CONFIG_OF_GPIO)           += gpiolib-of.o
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index e422568e14ad..fe731f094257 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -372,14 +372,15 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc,
 
         bank_shift = fls((chip->gpio_chip.ngpio - 1) / BANK_SZ);
 
-        memcpy(reg_val, chip->reg_output, NBANK(chip));
         mutex_lock(&chip->i2c_lock);
+        memcpy(reg_val, chip->reg_output, NBANK(chip));
         for (bank = 0; bank < NBANK(chip); bank++) {
                 bank_mask = mask[bank / sizeof(*mask)] >>
                            ((bank % sizeof(*mask)) * 8);
                 if (bank_mask) {
                         bank_val = bits[bank / sizeof(*bits)] >>
                                   ((bank % sizeof(*bits)) * 8);
+                        bank_val &= bank_mask;
                         reg_val[bank] = (reg_val[bank] & ~bank_mask) | bank_val;
                 }
         }
@@ -607,7 +608,6 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
 
         if (client->irq && irq_base != -1
                         && (chip->driver_data & PCA_INT)) {
-
                 ret = pca953x_read_regs(chip,
                                         chip->regs->input, chip->irq_stat);
                 if (ret)
diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index 5a5a6cb00eea..d6e21f1a70a9 100644
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -97,7 +97,7 @@ static int tc3589x_gpio_get_direction(struct gpio_chip *chip,
         if (ret < 0)
                 return ret;
 
-        return !!(ret & BIT(pos));
+        return !(ret & BIT(pos));
 }
 
 static int tc3589x_gpio_set_single_ended(struct gpio_chip *chip,
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 93ed0e00c578..868128a676ba 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -2737,8 +2737,11 @@ int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset)
         if (IS_ERR(desc))
                 return PTR_ERR(desc);
 
-        /* Flush direction if something changed behind our back */
-        if (chip->get_direction) {
+        /*
+         * If it's fast: flush the direction setting if something changed
+         * behind our back
+         */
+        if (!chip->can_sleep && chip->get_direction) {
                 int dir = chip->get_direction(chip, offset);
 
                 if (dir)