Merge remote-tracking branch 'asoc/topic/max9850' into asoc-next

[~andy/linux] / drivers / watchdog / cpu5wdt.c

diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c
index cd87758abac3154d3c411ed8b3ef9194a461f389..f270bb7bc4564126638200c270882da039219c88 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);