| From 01cca93a9491ed95992523ff7e79dd9bfcdea8e0 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Mon, 12 Jan 2015 17:12:29 +0100 |
| Subject: gpio: unregister gpiochip device before removing it |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| 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> |
| |
| |
| --- |
| drivers/gpio/gpiolib.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/gpio/gpiolib.c |
| +++ b/drivers/gpio/gpiolib.c |
| @@ -1265,6 +1265,8 @@ int gpiochip_remove(struct gpio_chip *ch |
| int status = 0; |
| unsigned id; |
| |
| + gpiochip_unexport(chip); |
| + |
| spin_lock_irqsave(&gpio_lock, flags); |
| |
| gpiochip_remove_pin_ranges(chip); |
| @@ -1285,9 +1287,6 @@ int gpiochip_remove(struct gpio_chip *ch |
| |
| spin_unlock_irqrestore(&gpio_lock, flags); |
| |
| - if (status == 0) |
| - gpiochip_unexport(chip); |
| - |
| return status; |
| } |
| EXPORT_SYMBOL_GPL(gpiochip_remove); |
