1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 37f919dc2cb4..568aa2b6bdb0 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -327,6 +327,8 @@ void gpiochip_remove(struct gpio_chip *chip)
         unsigned long   flags;
         unsigned        id;
 
+        gpiochip_unexport(chip);
+
         gpiochip_irqchip_remove(chip);
 
         acpi_gpiochip_remove(chip);
@@ -343,7 +345,6 @@ void gpiochip_remove(struct gpio_chip *chip)
 
         list_del(&chip->list);
         spin_unlock_irqrestore(&gpio_lock, flags);
-        gpiochip_unexport(chip);
 
         kfree(chip->desc);
         chip->desc = NULL;