---

yaml --- r: 347986 b: refs/heads/master c: e09d9c3 h: refs/heads/master v: v3
git-mirror · Dec 19, 2012 · a084c07 · a084c07
1 parent b9215a7
commit a084c07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e16cfb9d38541bf1591c2e0ca64a562074e25f72
+refs/heads/master: e09d9c3e9f85b8190ca1e495890f4cf5ee30baf6
diff --git a/trunk/drivers/watchdog/cpu5wdt.c b/trunk/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);