On Tue, Feb 13, 2018 at 7:08 AM, Chen-Yu Tsai <w...@csie.org> wrote:

> of_get_named_gpiod_flags() used directly in of_find_gpio() or indirectly
> through of_find_spi_gpio() or of_find_regulator_gpio() can return
> -EPROBE_DEFER. This gets overwritten by the subsequent of_find_*_gpio()
> calls.
>
> This patch fixes this by trying of_find_spi_gpio() or
> of_find_regulator_gpio() only if deferred probing was not requested by
> the previous of_get_named_gpiod_flags() call.
>
> Fixes: 6a537d48461d ("gpio: of: Support regulator nonstandard GPIO 
> properties")
> Fixes: c85823390215 ("gpio: of: Support SPI nonstandard GPIO properties")
> Signed-off-by: Chen-Yu Tsai <w...@csie.org>

Patch applied,

>         /* Special handling for SPI GPIOs if used */
> -       if (IS_ERR(desc))
> +       if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER)
>                 desc = of_find_spi_gpio(dev, con_id, &of_flags);

Dropped this hunk since Maxime's patch handles that.

>         /* 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);

Kept this.

Yours,
Linus Walleij

Reply via email to