Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / gpio / devres.c

diff --git a/drivers/gpio/devres.c b/drivers/gpio/devres.c
index 903fcf4d04a06e557bdacdeb69890d0cbf8c8a15..b760cbbb41d824908e1532f384de8c447b16b603 100644 (file)
--- a/drivers/gpio/devres.c
+++ b/drivers/gpio/devres.c
@@ -155,7 +155,7 @@ struct gpio_desc *devm_get_gpiod_from_child(struct device *dev,
                                                               suffixes[i]);
 
                desc = fwnode_get_named_gpiod(child, prop_name);
-               if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER))
+               if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
                        break;
        }
        if (IS_ERR(desc)) {