diff options
| author | Johan Hovold <johan@kernel.org> | 2015-01-12 17:12:29 +0100 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-05-20 13:26:00 +0100 |
| commit | 52812c8821ed62de51b31c21e38cce42855de723 (patch) | |
| tree | d1538c14e6f0dcd713777692ca4a7313e172dfc5 | |
| parent | 5b79da61f94da5e8b229796d98270ae29bdefe8e (diff) | |
| download | linux-stable-52812c8821ed62de51b31c21e38cce42855de723.tar.gz linux-stable-52812c8821ed62de51b31c21e38cce42855de723.tar.bz2 linux-stable-52812c8821ed62de51b31c21e38cce42855de723.zip | |
gpio: unregister gpiochip device before removing it
commit 01cca93a9491ed95992523ff7e79dd9bfcdea8e0 upstream.
Unregister gpiochip device (used to export information through sysfs)
before removing it internally. This way removal will reverse addition.
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[ luis: backported to 3.16: used Johan's backport to 3.14 ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/gpio/gpiolib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index d9b8844e2715..3f07d8aa848a 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1287,6 +1287,8 @@ int gpiochip_remove(struct gpio_chip *chip) int status = 0; unsigned id; + gpiochip_unexport(chip); + gpiochip_irqchip_remove(chip); acpi_gpiochip_remove(chip); @@ -1309,9 +1311,6 @@ int gpiochip_remove(struct gpio_chip *chip) spin_unlock_irqrestore(&gpio_lock, flags); - if (status == 0) - gpiochip_unexport(chip); - return status; } EXPORT_SYMBOL_GPL(gpiochip_remove); |