Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6798acaa authored by Johan Hovold's avatar Johan Hovold Committed by Linus Walleij
Browse files

gpio: fix sleep-while-atomic in gpiochip_remove 



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: 9ef0d6f7 ("gpiolib: call pin removal in chip removal function")
Fixes: f23f1516 ("gpiolib: provide provision to register pin ranges")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 00acc3dc

drivers/gpio/gpiolib.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -330,12 +330,10 @@ void gpiochip_remove(struct gpio_chip *chip) 
	gpiochip_irqchip_remove(chip);

	gpiochip_irqchip_remove(chip);





	acpi_gpiochip_remove(chip);

	acpi_gpiochip_remove(chip);



	spin_lock_irqsave(&gpio_lock, flags);



	gpiochip_remove_pin_ranges(chip);

	gpiochip_remove_pin_ranges(chip);

	of_gpiochip_remove(chip);

	of_gpiochip_remove(chip);





	spin_lock_irqsave(&gpio_lock, flags);

	for (id = 0; id < chip->ngpio; id++) {

	for (id = 0; id < chip->ngpio; id++) {

		if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags))

		if (test_bit(FLAG_REQUESTED, &chip->desc[id].flags))

			dev_crit(chip->dev, "REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED\n");

			dev_crit(chip->dev, "REMOVING GPIOCHIP WITH GPIOS STILL REQUESTED\n");