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

Commit f902a778 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Fix up device tree properties readout caused by my own refactorings"

* tag 'gpio-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: Handle deferred probing in of_find_gpio() properly
  gpiolib: Keep returning EPROBE_DEFER when we should
parents 97ace515 ce27fb2c

drivers/gpio/gpiolib-of.c

+14 −1
Original line number Diff line number Diff line
@@ -241,6 +241,19 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, 


		desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,

						&of_flags);

		/*

		 * -EPROBE_DEFER in our case means that we found a

		 * valid GPIO property, but no controller has been

		 * registered so far.

		 *

		 * This means we don't need to look any further for

		 * alternate name conventions, and we should really

		 * preserve the return code for our user to be able to

		 * retry probing later.

		 */

		if (IS_ERR(desc) && PTR_ERR(desc) == -EPROBE_DEFER)

			return desc;



		if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))

			break;

	}
@@ -250,7 +263,7 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, 
		desc = of_find_spi_gpio(dev, con_id, &of_flags);



	/* Special handling for regulator GPIOs if used */

	if (IS_ERR(desc))

	if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER)

		desc = of_find_regulator_gpio(dev, con_id, &of_flags);



	if (IS_ERR(desc))