patch-2.3.99-pre7 linux/drivers/acorn/block/fd1772.c

Next file: linux/drivers/atm/ambassador.c
Previous file: linux/arch/sparc64/solaris/misc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/acorn/block/fd1772.c linux/drivers/acorn/block/fd1772.c
@@ -303,11 +303,9 @@
         timer_active |= (1 << FLOPPY_TIMER);			\
 	} while(0)
 
-#define	START_TIMEOUT()					\
-    do {						\
-        del_timer( &timeout_timer );			\
-        timeout_timer.expires = jiffies + FLOPPY_TIMEOUT;	\
-        add_timer( &timeout_timer );			\
+#define	START_TIMEOUT()					     \
+    do {						     \
+        mod_timer(&timeout_timer, jiffies+FLOPPY_TIMEOUT); \
 	} while(0)
 
 #define	STOP_TIMEOUT()					\

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)