From a084c072ea12df70b58c02b91c1494f315e1f6ca Mon Sep 17 00:00:00 2001
From: "devendra.aaru" <devendra.aaru@gmail.com>
Date: Tue, 26 Jun 2012 14:48:26 +0530
Subject: [PATCH] --- yaml --- r: 347986 b: refs/heads/master c:
 e09d9c3e9f85b8190ca1e495890f4cf5ee30baf6 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/watchdog/cpu5wdt.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1bea1a04066b..b90b57042aad 100644
--- 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
index cd87758abac3..f270bb7bc456 100644
--- 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);