Commit 693bdaa1 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Linus Walleij

ACPI / gpio: do not fall back to parsing _CRS when we get a deferral

If, while locating GPIOs by name, we get probe deferral, we should
immediately report it to caller rather than trying to fall back to parsing
unnamed GPIOs from _CRS block.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-and-Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8a146fbe
...@@ -577,8 +577,10 @@ struct gpio_desc *acpi_find_gpio(struct device *dev, ...@@ -577,8 +577,10 @@ struct gpio_desc *acpi_find_gpio(struct device *dev,
} }
desc = acpi_get_gpiod_by_index(adev, propname, idx, &info); desc = acpi_get_gpiod_by_index(adev, propname, idx, &info);
if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER)) if (!IS_ERR(desc))
break; break;
if (PTR_ERR(desc) == -EPROBE_DEFER)
return ERR_CAST(desc);
} }
/* Then from plain _CRS GPIOs */ /* Then from plain _CRS GPIOs */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment