1 files changed, 34 insertions, 25 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 5163e87969e7..5b351f87c50a 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -950,9 +950,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);
@@ -1083,9 +1085,11 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 if (test_bit(FLAG_ACTIVE_LOW, &desc->flags))
                         lineinfo.flags |= GPIOLINE_FLAG_ACTIVE_LOW;
                 if (test_bit(FLAG_OPEN_DRAIN, &desc->flags))
-                        lineinfo.flags |= GPIOLINE_FLAG_OPEN_DRAIN;
+                        lineinfo.flags |= (GPIOLINE_FLAG_OPEN_DRAIN |
+                                           GPIOLINE_FLAG_IS_OUT);
                 if (test_bit(FLAG_OPEN_SOURCE, &desc->flags))
-                        lineinfo.flags |= GPIOLINE_FLAG_OPEN_SOURCE;
+                        lineinfo.flags |= (GPIOLINE_FLAG_OPEN_SOURCE |
+                                           GPIOLINE_FLAG_IS_OUT);
 
                 if (copy_to_user(ip, &lineinfo, sizeof(lineinfo)))
                         return -EFAULT;
@@ -1363,21 +1367,13 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
         if (ret)
                 goto err_remove_from_list;
 
-        ret = gpiochip_irqchip_init_valid_mask(chip);
-        if (ret)
-                goto err_remove_from_list;
-
         ret = gpiochip_alloc_valid_mask(chip);
         if (ret)
-                goto err_remove_irqchip_mask;
-
-        ret = gpiochip_add_irqchip(chip, lock_key, request_key);
-        if (ret)
-                goto err_free_gpiochip_mask;
+                goto err_remove_from_list;
 
         ret = of_gpiochip_add(chip);
         if (ret)
-                goto err_remove_chip;
+                goto err_free_gpiochip_mask;
 
         ret = gpiochip_init_valid_mask(chip);
         if (ret)
@@ -1386,18 +1382,31 @@ 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);
 
         machine_gpiochip_add(chip);
 
+        status = gpiochip_irqchip_init_valid_mask(chip);
+        if (status)
+                goto err_remove_acpi_chip;
+
+        status = gpiochip_add_irqchip(chip, lock_key, request_key);
+        if (status)
+                goto err_remove_irqchip_mask;
+
         /*
          * By first adding the chardev, and then adding the device,
          * we get a device node entry in sysfs under
@@ -1409,21 +1418,21 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
         if (gpiolib_initialized) {
                 ret = gpiochip_setup_dev(gdev);
                 if (ret)
-                        goto err_remove_acpi_chip;
+                        goto err_remove_irqchip;
         }
         return 0;
 
+err_remove_irqchip:
+        gpiochip_irqchip_remove(chip);
+err_remove_irqchip_mask:
+        gpiochip_irqchip_free_valid_mask(chip);
 err_remove_acpi_chip:
         acpi_gpiochip_remove(chip);
 err_remove_of_chip:
         gpiochip_free_hogs(chip);
         of_gpiochip_remove(chip);
-err_remove_chip:
-        gpiochip_irqchip_remove(chip);
 err_free_gpiochip_mask:
         gpiochip_free_valid_mask(chip);
-err_remove_irqchip_mask:
-        gpiochip_irqchip_free_valid_mask(chip);
 err_remove_from_list:
         spin_lock_irqsave(&gpio_lock, flags);
         list_del(&gdev->list);