projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'binfmt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...
[deliverable/linux.git]
/
drivers
/
watchdog
/
watchdog_dev.c
diff --git
a/drivers/watchdog/watchdog_dev.c
b/drivers/watchdog/watchdog_dev.c
index f128efc361352a9e19b80c6eb580e7e61565c2ba..040bf8382f46cd9c40673412339a8da672887594 100644
(file)
--- a/
drivers/watchdog/watchdog_dev.c
+++ b/
drivers/watchdog/watchdog_dev.c
@@
-267,10
+267,12
@@
static int watchdog_stop(struct watchdog_device *wdd)
return -EBUSY;
}
- if (wdd->ops->stop)
+ if (wdd->ops->stop) {
+ clear_bit(WDOG_HW_RUNNING, &wdd->status);
err = wdd->ops->stop(wdd);
- else
+ } else {
set_bit(WDOG_HW_RUNNING, &wdd->status);
+ }
if (err == 0) {
clear_bit(WDOG_ACTIVE, &wdd->status);
This page took
0.023663 seconds
and
5
git commands to generate.