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
/
net
/
appletalk
/
ltpc.c
diff --git
a/drivers/net/appletalk/ltpc.c
b/drivers/net/appletalk/ltpc.c
index
ad8e943
..
d5666c3
100644
(file)
--- a/
drivers/net/appletalk/ltpc.c
+++ b/
drivers/net/appletalk/ltpc.c
@@
-1039,7
+1039,7
@@
struct net_device * __init ltpc_probe(void)
unsigned long f;
unsigned long timeout;
unsigned long f;
unsigned long timeout;
- dev = alloc_
netdev(sizeof(struct ltpc_private), "lt%d", ltalk_setup
);
+ dev = alloc_
ltalkdev(sizeof(struct ltpc_private)
);
if (!dev)
goto out;
if (!dev)
goto out;
@@
-1109,8
+1109,7
@@
struct net_device * __init ltpc_probe(void)
inb_p(io+1);
inb_p(io+3);
inb_p(io+1);
inb_p(io+3);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(2*HZ/100);
+ msleep(20);
inb_p(io+0);
inb_p(io+2);
inb_p(io+0);
inb_p(io+2);
@@
-1120,8
+1119,7
@@
struct net_device * __init ltpc_probe(void)
inb_p(io+5); /* enable dma */
inb_p(io+6); /* tri-state interrupt line */
inb_p(io+5); /* enable dma */
inb_p(io+6); /* tri-state interrupt line */
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(HZ);
+ ssleep(1);
/* now, figure out which dma channel we're using, unless it's
already been specified */
/* now, figure out which dma channel we're using, unless it's
already been specified */