Merge tag 'nfsd-4.13' of git://linux-nfs.org/~bfields/linux

[mirror_ubuntu-artful-kernel.git] / drivers / watchdog / sama5d4_wdt.c

diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index 362fd229786df6cea1600108a9060b89b800f475..0ae947c3d7bcb10a1e8caae89b065e5bdf1de45f 100644 (file)
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -228,15 +228,13 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 
        wdt->reg_base = regs;
 
-       if (pdev->dev.of_node) {
-               irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
-               if (!irq)
-                       dev_warn(&pdev->dev, "failed to get IRQ from DT\n");
+       irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
+       if (!irq)
+               dev_warn(&pdev->dev, "failed to get IRQ from DT\n");
 
-               ret = of_sama5d4_wdt_init(pdev->dev.of_node, wdt);
-               if (ret)
-                       return ret;
-       }
+       ret = of_sama5d4_wdt_init(pdev->dev.of_node, wdt);
+       if (ret)
+               return ret;
 
        if ((wdt->mr & AT91_WDT_WDFIEN) && irq) {
                ret = devm_request_irq(&pdev->dev, irq, sama5d4_wdt_irq_handler,
@@ -302,6 +300,11 @@ static int sama5d4_wdt_resume(struct device *dev)
 {
        struct sama5d4_wdt *wdt = dev_get_drvdata(dev);
 
+       /*
+        * FIXME: writing MR also pings the watchdog which may not be desired.
+        * This should only be done when the registers are lost on suspend but
+        * there is no way to get this information right now.
+        */
        sama5d4_wdt_init(wdt);
 
        return 0;