diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 23:11:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 23:11:50 -0700 |
| commit | 060de20e82195d404f7dc6a914685730376fdc80 (patch) | |
| tree | f7b8499beaae104016b46e7583b2dbc1d6d7f901 /drivers/net | |
| parent | b7c84c6ada2be942eca6722edb2cfaad412cd5de (diff) | |
| parent | 2c4ee8f907fc4a3c69273a958f853bf4b358eb49 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/appletalk/ltpc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index db4f369637b..d5666c37cb0 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c @@ -1109,8 +1109,7 @@ struct net_device * __init ltpc_probe(void) 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); @@ -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 */ - 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 */ |