Merge tag 'pci-v5.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[linux-2.6-microblaze.git] / drivers / rtc / rtc-stm32.c

diff --git a/drivers/rtc/rtc-stm32.c b/drivers/rtc/rtc-stm32.c
index c5908cf..8e6c9b3 100644 (file)
--- a/drivers/rtc/rtc-stm32.c
+++ b/drivers/rtc/rtc-stm32.c
@@ -788,11 +788,14 @@ static int stm32_rtc_probe(struct platform_device *pdev)
        ret = device_init_wakeup(&pdev->dev, true);
        if (rtc->data->has_wakeirq) {
                rtc->wakeirq_alarm = platform_get_irq(pdev, 1);
-               if (rtc->wakeirq_alarm <= 0)
-                       ret = rtc->wakeirq_alarm;
-               else
+               if (rtc->wakeirq_alarm > 0) {
                        ret = dev_pm_set_dedicated_wake_irq(&pdev->dev,
                                                            rtc->wakeirq_alarm);
+               } else {
+                       ret = rtc->wakeirq_alarm;
+                       if (rtc->wakeirq_alarm == -EPROBE_DEFER)
+                               goto err;
+               }
        }
        if (ret)
                dev_warn(&pdev->dev, "alarm can't wake up the system: %d", ret);