1 files changed, 15 insertions, 8 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 3ee99d070608..f497003f119c 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -956,9 +956,11 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)
         }
 
         if (eflags & GPIOEVENT_REQUEST_RISING_EDGE)
-                irqflags |= IRQF_TRIGGER_RISING;
+                irqflags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ?
+                        IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING;
         if (eflags & GPIOEVENT_REQUEST_FALLING_EDGE)
-                irqflags |= IRQF_TRIGGER_FALLING;
+                irqflags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ?
+                        IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING;
         irqflags |= IRQF_ONESHOT;
 
         INIT_KFIFO(le->events);
@@ -1392,12 +1394,17 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
         for (i = 0; i < chip->ngpio; i++) {
                 struct gpio_desc *desc = &gdev->descs[i];
 
-                if (chip->get_direction && gpiochip_line_is_valid(chip, i))
-                        desc->flags = !chip->get_direction(chip, i) ?
-                                        (1 << FLAG_IS_OUT) : 0;
-                else
-                        desc->flags = !chip->direction_input ?
-                                        (1 << FLAG_IS_OUT) : 0;
+                if (chip->get_direction && gpiochip_line_is_valid(chip, i)) {
+                        if (!chip->get_direction(chip, i))
+                                set_bit(FLAG_IS_OUT, &desc->flags);
+                        else
+                                clear_bit(FLAG_IS_OUT, &desc->flags);
+                } else {
+                        if (!chip->direction_input)
+                                set_bit(FLAG_IS_OUT, &desc->flags);
+                        else
+                                clear_bit(FLAG_IS_OUT, &desc->flags);
+                }
         }
 
         acpi_gpiochip_add(chip);