diff options
| author | Johan Hovold <johan@kernel.org> | 2015-01-12 17:12:28 +0100 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-02-04 10:57:20 +0000 |
| commit | b968027c7b2145f743bfd91c347f92105e38ddbc (patch) | |
| tree | 4b3357bbff2cf130ab0d2158057c97ab775f6ae0 | |
| parent | cacd4bf52e5932e2f9a80c38f597a7286d87ca4a (diff) | |
| download | linux-stable-b968027c7b2145f743bfd91c347f92105e38ddbc.tar.gz linux-stable-b968027c7b2145f743bfd91c347f92105e38ddbc.tar.bz2 linux-stable-b968027c7b2145f743bfd91c347f92105e38ddbc.zip | |
gpio: fix sleep-while-atomic in gpiochip_remove
commit 6798acaa0138d8b12f1c54402ebcb66fea3deb03 upstream.
Move direct and indirect calls to gpiochip_remove_pin_ranges outside of
spin lock as they can end up taking a mutex in pinctrl_remove_gpio_range.
Note that the pin ranges are already added outside of the lock.
Fixes: 9ef0d6f7628b ("gpiolib: call pin removal in chip removal function")
Fixes: f23f1516b675 ("gpiolib: provide provision to register pin ranges")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/gpio/gpiolib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 2c7157705e71..f3414d09267d 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1275,12 +1275,10 @@ int gpiochip_remove(struct gpio_chip *chip) gpiochip_irqchip_remove(chip); acpi_gpiochip_remove(chip); - - spin_lock_irqsave(&gpio_lock, flags); - gpiochip_remove_pin_ranges(chip); of_gpiochip_remove(chip); + spin_lock_irqsave(&gpio_lock, flags); for (id = 0; id < chip->ngpio; id++) { if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags)) { status = -EBUSY; |