In my previous patch against 2.5.68, missed out killing del_timer.
Thanks to Christian Heller for pointing it out.
vinay
floppy98.c: Trivial {del,add}_timer to mod_timer conversions.
--- linux-2.5.69/drivers/block/floppy98.c 2003-05-05 09:56:04.000000000 +0530
+++ linux-2.5.69-nvk/drivers/block/floppy98.c 2003-05-07 09:43:22.000000000 +0530
@@ -702,15 +702,16 @@
static void reschedule_timeout(int drive, const char *message, int marg)
{
+ long delay;
+
if (drive == current_reqD)
drive = current_drive;
- del_timer(&fd_timeout);
if (drive < 0 || drive > N_DRIVE) {
- fd_timeout.expires = jiffies + 20UL*HZ;
+ delay = jiffies + 20UL*HZ;
drive=0;
} else
- fd_timeout.expires = jiffies + UDP->timeout;
- add_timer(&fd_timeout);
+ delay = jiffies + UDP->timeout;
+ mod_timer(&fd_timeout, delay);
if (UDP->flags & FD_DEBUG){
DPRINT("reschedule timeout ");
printk(message, marg);