X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Fdtlk.c;h=903e4c3cc20914aad2b8fe8aec8796b57a70dc8b;hb=f1227cd3e0e73c48b93368800aa89f4341103a00;hp=2a11c68aa4e816b7dd17ccbc983fa3c1bdee06aa;hpb=340e2b1a4c74f653454348914c408420d5d3c28a;p=linux-2.6.git

diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 2a11c68aa..903e4c3cc 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -52,7 +52,7 @@
 #define KERNEL
 #include <linux/types.h>
 #include <linux/fs.h>
-#include <linux/mm.h>
+#include <linux/mm.h>		/* for verify_area */
 #include <linux/errno.h>	/* for -EBUSY */
 #include <linux/ioport.h>	/* for request_region */
 #include <linux/delay.h>	/* for loops_per_jiffy */
@@ -198,7 +198,7 @@ static ssize_t dtlk_write(struct file *file, const char __user *buf,
 				   up to 250 usec for the RDY bit to
 				   go nonzero. */
 				for (retries = 0;
-				     retries < HZ*(loops_per_jiffy >> 3)/500;
+				     retries < loops_per_jiffy / (4000/HZ);
 				     retries++)
 					if (inb_p(dtlk_port_tts) &
 					    TTS_WRITABLE)
@@ -445,7 +445,7 @@ for (i = 0; i < 10; i++)			\
 				LOOK
 				dtlk_write_bytes("\0012I\r", 4);
 				buffer[b++] = 0;
-				__delay(50 * (loops_per_jiffy >> 3) * HZ / 125);
+				__delay(50 * loops_per_jiffy / (1000/HZ));
 				outb_p(0xff, dtlk_port_lpc);
 				buffer[b++] = 0;
 				LOOK