]> git.baikalelectronics.ru Git - kernel.git/commitdiff
watchdog: wdat_wdt: Ping the watchdog on resume
authorMika Westerberg <mika.westerberg@linux.intel.com>
Thu, 20 Oct 2016 15:03:36 +0000 (18:03 +0300)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Oct 2016 23:28:33 +0000 (01:28 +0200)
It turns out we need to ping the watchdog hardware on resume when we
re-program it. Otherwise this causes inadvertent reset to trigger
right after the resume is complete.

Fixes: 058dfc767008 (ACPI / watchdog: Add support for WDAT hardware watchdog)
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/watchdog/wdat_wdt.c

index e473e3b237203fcc7440128e804e3bbb141fc0b2..6d1fbda0f461ca2d2304eaeb43aef35adfd77cf4 100644 (file)
@@ -499,6 +499,10 @@ static int wdat_wdt_resume_noirq(struct device *dev)
                ret = wdat_wdt_enable_reboot(wdat);
                if (ret)
                        return ret;
+
+               ret = wdat_wdt_ping(&wdat->wdd);
+               if (ret)
+                       return ret;
        }
 
        return wdat_wdt_start(&wdat->wdd);