aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpio/gpiolib.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 0f8173051edc..37f919dc2cb4 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -330,12 +330,10 @@ void gpiochip_remove(struct gpio_chip *chip)
330 gpiochip_irqchip_remove(chip); 330 gpiochip_irqchip_remove(chip);
331 331
332 acpi_gpiochip_remove(chip); 332 acpi_gpiochip_remove(chip);
333
334 spin_lock_irqsave(&gpio_lock, flags);
335
336 gpiochip_remove_pin_ranges(chip); 333 gpiochip_remove_pin_ranges(chip);
337 of_gpiochip_remove(chip); 334 of_gpiochip_remove(chip);
338 335
336 spin_lock_irqsave(&gpio_lock, flags);
339 for (id = 0; id < chip->ngpio; id++) { 337 for (id = 0; id < chip->ngpio; id++) {
340 if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags)) 338 if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags))
341 dev_crit(chip->dev, "REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED\n"); 339 dev_crit(chip->dev, "REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED\n");