From: Johan Hovold Date: Mon, 12 Jan 2015 16:12:28 +0000 (+0100) Subject: gpio: fix sleep-while-atomic in gpiochip_remove X-Git-Tag: v3.16.35~3006 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b968027c7b2145f743bfd91c347f92105e38ddbc;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Linus Walleij Signed-off-by: Luis Henriques --- diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 2c7157705e719..f3414d09267d2 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;