mod_timer fix for floppy98.c

PATCH New Vinay K Nallamothu 1 participant 1 message May 7, 2003 Block layer

lore

Share & tools

lore

Vinay K Nallamothu

author

2003-05-07 04:02 UTC #0 lore raw

PATCH 1/1 mod_timer fix for floppy98.c

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.

drivers/block/floppy98.c +5 -4

@@ -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);