1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index a006f0db15af..15be3d9aebe9 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -596,7 +596,10 @@ static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
         unsigned long con;
 
         con = __raw_readl(base + GPIOCON_OFF);
-        con &= ~(0xf << con_4bit_shift(offset));
+        if (ourchip->bitmap_gpio_int & BIT(offset))
+                con |= 0xf << con_4bit_shift(offset);
+        else
+                con &= ~(0xf << con_4bit_shift(offset));
         __raw_writel(con, base + GPIOCON_OFF);
 
         gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
@@ -1081,6 +1084,8 @@ static void __init samsung_gpiolib_add_4bit_chips(struct samsung_gpio_chip *chip
                 if ((base != NULL) && (chip->base == NULL))
                         chip->base = base + ((i) * 0x20);
 
+                chip->bitmap_gpio_int = 0;
+
                 samsung_gpiolib_add(chip);
         }
 }