ACPI / gpio: do not fall back to parsing _CRS when we get a deferral
commit 693bdaa164b40b7aa6018b98af6f7e40dbd52457 upstream. 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. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-and-Tested-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ab83597b9d
commit
e4a6234893
@ -571,8 +571,10 @@ struct gpio_desc *acpi_find_gpio(struct device *dev,
|
||||
}
|
||||
|
||||
desc = acpi_get_gpiod_by_index(adev, propname, idx, &info);
|
||||
if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER))
|
||||
if (!IS_ERR(desc))
|
||||
break;
|
||||
if (PTR_ERR(desc) == -EPROBE_DEFER)
|
||||
return ERR_CAST(desc);
|
||||
}
|
||||
|
||||
/* Then from plain _CRS GPIOs */
|
||||
|
Loading…
x
Reference in New Issue
Block a user