patch-2.3.99-pre7 linux/drivers/char/dtlk.c

• Lines: 21
• Date: Fri Apr 28 22:50:13 2000
• Orig file: v2.3.99-pre6/linux/drivers/char/dtlk.c
• Orig date: Sun Mar 19 18:35:30 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/char/dtlk.c linux/drivers/char/dtlk.c
@@ -241,6 +241,8 @@
 static unsigned int dtlk_poll(struct file *file, poll_table * wait)
 {
 	int mask = 0;
+	unsigned long expires;
+
 	TRACE_TEXT(" dtlk_poll");
 	/*
 	   static long int j;
@@ -261,9 +263,8 @@
 	/* there are no exception conditions */
 
 	/* There won't be any interrupts, so we set a timer instead. */
-	del_timer(&dtlk_timer);
-	dtlk_timer.expires = jiffies + 3*HZ / 100;
-	add_timer(&dtlk_timer);
+	expires = jiffies + 3*HZ / 100;
+	mod_timer(&dtlk_timer, expires);
 
 	return mask;
 }