Commit 56e337f2 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Linus Torvalds
Browse files

Revert "gpio: Revert regression in sysfs-gpio (gpiolib.c)" 

This reverts commit fc328a7d.

This commit - while attempting to fix a regression - has caused a number
of other problems. As the fallout from it is more significant than the
initial problem itself, revert it for now before we find a correct
solution.

Link: https://lore.kernel.org/all/20220314192522.GA3031157@roeck-us.net/
Link: https://lore.kernel.org/stable/20220314155509.552218-1-michael@walle.cc/
Link: https://lore.kernel.org/all/20211217153555.9413-1-marcelo.jimenez@gmail.com/


Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Reported-and-bisected-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reported-by: default avatarMichael Walle <michael@walle.cc>
Cc: Thorsten Leemhuis <linux@leemhuis.info>
Cc: Marcelo Roberto Jimenez <marcelo.jimenez@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6665ca15

drivers/gpio/gpiolib.c

+10 −0
Original line number Diff line number Diff line
@@ -1701,6 +1701,11 @@ static inline void gpiochip_irqchip_free_valid_mask(struct gpio_chip *gc) 
 */

int gpiochip_generic_request(struct gpio_chip *gc, unsigned int offset)

{

#ifdef CONFIG_PINCTRL

	if (list_empty(&gc->gpiodev->pin_ranges))

		return 0;

#endif



	return pinctrl_gpio_request(gc->gpiodev->base + offset);

}

EXPORT_SYMBOL_GPL(gpiochip_generic_request);
@@ -1712,6 +1717,11 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_request); 
 */

void gpiochip_generic_free(struct gpio_chip *gc, unsigned int offset)

{

#ifdef CONFIG_PINCTRL

	if (list_empty(&gc->gpiodev->pin_ranges))

		return;

#endif



	pinctrl_gpio_free(gc->gpiodev->base + offset);

}

EXPORT_SYMBOL_GPL(gpiochip_generic_free);