From: devendra.aaru Date: Tue, 26 Jun 2012 09:18:26 +0000 (+0530) Subject: watchdog: cpu5wdt.c: add missing del_timer call X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e09d9c3e9f85b8190ca1e495890f4cf5ee30baf6;p=deliverable%2Flinux.git 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 Signed-off-by: Wim Van Sebroeck --- 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);