git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
char
/
dtlk.c
diff --git
a/drivers/char/dtlk.c
b/drivers/char/dtlk.c
index
2a11c68
..
87dcaa2
100644
(file)
--- a/
drivers/char/dtlk.c
+++ b/
drivers/char/dtlk.c
@@
-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;
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)
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;
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
outb_p(0xff, dtlk_port_lpc);
buffer[b++] = 0;
LOOK
@@
-490,7
+490,7
@@
for (i = 0; i < 10; i++) \
release_region(dtlk_portlist[i], DTLK_IO_EXTENT);
}
release_region(dtlk_portlist[i], DTLK_IO_EXTENT);
}
- printk(KERN_INFO "
\n
DoubleTalk PC - not found\n");
+ printk(KERN_INFO "DoubleTalk PC - not found\n");
return -ENODEV;
}
return -ENODEV;
}