summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authordevendra.aaru <devendra.aaru@gmail.com>2012-06-26 14:48:26 +0530
committerWim Van Sebroeck <wim@iguana.be>2012-12-19 22:24:41 +0100
commite09d9c3e9f85b8190ca1e495890f4cf5ee30baf6 (patch)
tree6070112df3a8aac59352f0d0f0c968b83a2e8a9a /drivers/watchdog
parente16cfb9d38541bf1591c2e0ca64a562074e25f72 (diff)
downloadblackbird-op-linux-e09d9c3e9f85b8190ca1e495890f4cf5ee30baf6.tar.gz
blackbird-op-linux-e09d9c3e9f85b8190ca1e495890f4cf5ee30baf6.zip
watchdog: cpu5wdt.c: add missing del_timer call
We do a setup_timer at init stage of the module, but we didn't de-activate the time using del_timer. Signed-off-by: devendra.aaru <devendra.aaru@gmail.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/cpu5wdt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c
index cd87758abac3..f270bb7bc456 100644
--- 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);
OpenPOWER on IntegriCloud