Browse Source

gpio: Move freeing of GPIO hogs before numbing of the device

When removing a gpiochip that uses GPIO hogging (e.g. by unloading the
chip's DT overlay), a warning is printed:

    gpio gpiochip8: REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED

This happens because gpiochip_free_hogs() is called after the gdev->chip
pointer is reset to NULL. Hence __gpiod_free() cannot determine the
chip in use, and cannot clear flags nor call the optional chip-specific
.free() callback.

Move the call to gpiochip_free_hogs() up to fix this.

Cc: stable@vger.kernel.org
Fixes: ff2b135922992756 ("gpio: make the gpiochip a real device")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Geert Uytterhoeven 8 years ago
parent
commit
5018ada69a
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/gpio/gpiolib.c

+ 1 - 1
drivers/gpio/gpiolib.c

@@ -1317,12 +1317,12 @@ void gpiochip_remove(struct gpio_chip *chip)
 
 
 	/* FIXME: should the legacy sysfs handling be moved to gpio_device? */
 	/* FIXME: should the legacy sysfs handling be moved to gpio_device? */
 	gpiochip_sysfs_unregister(gdev);
 	gpiochip_sysfs_unregister(gdev);
+	gpiochip_free_hogs(chip);
 	/* Numb the device, cancelling all outstanding operations */
 	/* Numb the device, cancelling all outstanding operations */
 	gdev->chip = NULL;
 	gdev->chip = NULL;
 	gpiochip_irqchip_remove(chip);
 	gpiochip_irqchip_remove(chip);
 	acpi_gpiochip_remove(chip);
 	acpi_gpiochip_remove(chip);
 	gpiochip_remove_pin_ranges(chip);
 	gpiochip_remove_pin_ranges(chip);
-	gpiochip_free_hogs(chip);
 	of_gpiochip_remove(chip);
 	of_gpiochip_remove(chip);
 	/*
 	/*
 	 * We accept no more calls into the driver from this point, so
 	 * We accept no more calls into the driver from this point, so