[libata] kill timer when thread dies

Noticed and fixed by David Woodhouse.

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 4ac1a85690ceabd34bacf4bd2cbb1b28a3d7ff3c..06259aedd262b3f1d97f1fb6acad819e444a58eb 100644 (file)
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2571,7 +2571,8 @@ static int ata_thread (void *data)
 
        printk(KERN_DEBUG "ata%u: thread exiting\n", ap->id);
        ap->thr_pid = -1;
-        complete_and_exit (&ap->thr_exited, 0);
+       del_timer_sync(&ap->thr_timer);
+       complete_and_exit (&ap->thr_exited, 0);
 }
 
 /**