projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'regulator-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
watchdog
/
wdat_wdt.c
diff --git
a/drivers/watchdog/wdat_wdt.c
b/drivers/watchdog/wdat_wdt.c
index
e473e3b
..
6d1fbda
100644
(file)
--- a/
drivers/watchdog/wdat_wdt.c
+++ b/
drivers/watchdog/wdat_wdt.c
@@
-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);