diff options
| author | Johan Hovold <johan@kernel.org> | 2015-01-12 17:12:29 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-05-16 09:12:43 +0200 |
| commit | e7a8407b62058c296d0087cf6a3a867cbe14057f (patch) | |
| tree | 5c5d83726bff42a6e48216db331ce0011d667e6d | |
| parent | 1c5c833e1a16bdb7597d26c74a543bdf12435e31 (diff) | |
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 8a9b61adcd87..9ba1bb0edab3 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1257,6 +1257,8 @@ int gpiochip_remove(struct gpio_chip *chip) int status = 0; unsigned id; + gpiochip_unexport(chip); + spin_lock_irqsave(&gpio_lock, flags); gpiochip_remove_pin_ranges(chip); @@ -1277,9 +1279,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); |