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>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 36ae055..5cd019b 100644 (file)
--- 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;
 
        int             status = 0;
        unsigned        id;
 

+       gpiochip_unexport(chip);
+

        spin_lock_irqsave(&gpio_lock, flags);
 
        of_gpiochip_remove(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);
 
 
        spin_unlock_irqrestore(&gpio_lock, flags);
 

-       if (status == 0)
-               gpiochip_unexport(chip);
-

        return status;
 }
 EXPORT_SYMBOL_GPL(gpiochip_remove);
        return status;
 }
 EXPORT_SYMBOL_GPL(gpiochip_remove);