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

Commit be7ae45c authored by Marco Felsch's avatar Marco Felsch Committed by Bartosz Golaszewski
Browse files

gpio: fix getting nonexclusive gpiods from DT 



Since commit ec757001 ("gpio: Enable nonexclusive gpiods from DT
nodes") we are able to get GPIOD_FLAGS_BIT_NONEXCLUSIVE marked gpios.
Currently the gpiolib uses the wrong flags variable for the check. We
need to check the gpiod_flags instead of the of_gpio_flags else we
return -EBUSY for GPIOD_FLAGS_BIT_NONEXCLUSIVE marked and requested
gpiod's.

Fixes: ec757001 gpio: Enable nonexclusive gpiods from DT nodes
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMarco Felsch <m.felsch@pengutronix.de>
[Bartosz: the function was moved to gpiolib-of.c so updated the patch]
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent e735244e

drivers/gpio/gpiolib-of.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ struct gpio_desc *gpiod_get_from_of_node(struct device_node *node, 
	transitory = flags & OF_GPIO_TRANSITORY;



	ret = gpiod_request(desc, label);

	if (ret == -EBUSY && (flags & GPIOD_FLAGS_BIT_NONEXCLUSIVE))

	if (ret == -EBUSY && (dflags & GPIOD_FLAGS_BIT_NONEXCLUSIVE))

		return desc;

	if (ret)

		return ERR_PTR(ret);