diff options
| author | Johan Hovold <johan@kernel.org> | 2015-01-12 17:12:29 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-07 00:32:08 +0100 |
| commit | c833e96de15cb46c8587271a32c651c0acc40dd3 (patch) | |
| tree | 2f747a36924345065112a87c14ef02894e766835 /drivers/gpio/gpiolib.c | |
| parent | 56481c2920bb35e8a0b8abd55eeb5e52e8bce042 (diff) | |
| download | kernel_samsung_smdk4412-c833e96de15cb46c8587271a32c651c0acc40dd3.zip kernel_samsung_smdk4412-c833e96de15cb46c8587271a32c651c0acc40dd3.tar.gz kernel_samsung_smdk4412-c833e96de15cb46c8587271a32c651c0acc40dd3.tar.bz2 | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/gpio/gpiolib.c')
| -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 36ae055..5cd019b 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1137,6 +1137,8 @@ int gpiochip_remove(struct gpio_chip *chip) int status = 0; unsigned id; + gpiochip_unexport(chip); + spin_lock_irqsave(&gpio_lock, flags); of_gpiochip_remove(chip); @@ -1154,9 +1156,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); |