linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2.5.68] mod_timer fix for floppy.c
@ 2003-05-03 13:30 Vinay K Nallamothu
  0 siblings, 0 replies; only message in thread
From: Vinay K Nallamothu @ 2003-05-03 13:30 UTC (permalink / raw)
  To: davej; +Cc: linux-kernel

Hi,

Trivial {del,add}_timer to mod_timer conversions.

vinay

--- linux-2.5.68/drivers/block/floppy.c	2003-04-21 10:14:23.000000000 +0530
+++ linux-2.5.68-nvk/drivers/block/floppy.c	2003-05-03 15:37:14.000000000 +0530
@@ -667,15 +667,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);




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2003-05-03 13:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-05-03 13:30 [PATCH 2.5.68] mod_timer fix for floppy.c Vinay K Nallamothu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).