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 v3.9-rc1 into for-3.9/upstream-fixes
[cascardo/linux.git]
/
drivers
/
watchdog
/
cpu5wdt.c
diff --git
a/drivers/watchdog/cpu5wdt.c
b/drivers/watchdog/cpu5wdt.c
index
cd87758
..
f270bb7
100644
(file)
--- a/
drivers/watchdog/cpu5wdt.c
+++ b/
drivers/watchdog/cpu5wdt.c
@@
-266,6
+266,7
@@
static void cpu5wdt_exit(void)
if (cpu5wdt_device.queue) {
cpu5wdt_device.queue = 0;
wait_for_completion(&cpu5wdt_device.stop);
+ del_timer(&cpu5wdt_device.timer);
}
misc_deregister(&cpu5wdt_misc);