patch-2.2.17 linux/drivers/char/dtlk.c

• Lines: 29
• Date: Mon Sep 4 18:39:17 2000
• Orig file: v2.2.16/drivers/char/dtlk.c
• Orig date: Mon Sep 4 18:37:32 2000

diff -u --recursive --new-file v2.2.16/drivers/char/dtlk.c linux/drivers/char/dtlk.c
@@ -272,14 +272,14 @@
 	}
 	/* there are no exception conditions */
 
-	if (mask == 0 && !dtlk_timer_active) {
+	{
 		/* not ready just yet.  There won't be any interrupts,
 		   so we set a timer instead. */
 		dtlk_timer_active = 1;
 		dtlk_timer.expires = jiffies + HZ / 100;
 		add_timer(&dtlk_timer);
 	}
-	return 0;
+	return mask;
 }
 
 static void dtlk_stop_timer()
@@ -295,11 +295,6 @@
 
 	wake_up_interruptible(&dtlk_process_list);
 
-	if (dtlk_timer_active) {
-		del_timer(&dtlk_timer);
-		dtlk_timer.expires = jiffies + HZ / 100;
-		add_timer(&dtlk_timer);
-	}
 }
 
 static int dtlk_ioctl(struct inode *inode,