1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 8fbc67a88465..3707930e082e 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1266,11 +1266,12 @@ int gpiochip_remove(struct gpio_chip *chip)
         int             status = 0;
         unsigned        id;
 
+        acpi_gpiochip_remove(chip);
+
         spin_lock_irqsave(&gpio_lock, flags);
 
         gpiochip_remove_pin_ranges(chip);
         of_gpiochip_remove(chip);
-        acpi_gpiochip_remove(chip);
 
         for (id = 0; id < chip->ngpio; id++) {
                 if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags)) {