Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyper...

[platform/kernel/linux-rpi.git] / drivers / power / reset / gpio-restart.c

diff --git a/drivers/power/reset/gpio-restart.c b/drivers/power/reset/gpio-restart.c
index 308ca9d..5466eee 100644 (file)
--- a/drivers/power/reset/gpio-restart.c
+++ b/drivers/power/reset/gpio-restart.c
@@ -64,9 +64,11 @@ static int gpio_restart_probe(struct platform_device *pdev)
 
        gpio_restart->reset_gpio = devm_gpiod_get(&pdev->dev, NULL,
                        open_source ? GPIOD_IN : GPIOD_OUT_LOW);
-       if (IS_ERR(gpio_restart->reset_gpio)) {
-               dev_err(&pdev->dev, "Could not get reset GPIO\n");
-               return PTR_ERR(gpio_restart->reset_gpio);
+       ret = PTR_ERR_OR_ZERO(gpio_restart->reset_gpio);
+       if (ret) {
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "Could not get reset GPIO\n");
+               return ret;
        }
 
        gpio_restart->restart_handler.notifier_call = gpio_restart_notify;