diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 02:11:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 02:11:50 -0400 |
| commit | 060de20e82195d404f7dc6a914685730376fdc80 (patch) | |
| tree | f7b8499beaae104016b46e7583b2dbc1d6d7f901 /drivers | |
| parent | b7c84c6ada2be942eca6722edb2cfaad412cd5de (diff) | |
| parent | 2c4ee8f907fc4a3c69273a958f853bf4b358eb49 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers')
| -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 db4f369637b6..d5666c37cb0d 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
| @@ -1109,8 +1109,7 @@ struct net_device * __init ltpc_probe(void) | |||
| 1109 | inb_p(io+1); | 1109 | inb_p(io+1); |
| 1110 | inb_p(io+3); | 1110 | inb_p(io+3); |
| 1111 | 1111 | ||
| 1112 | set_current_state(TASK_UNINTERRUPTIBLE); | 1112 | msleep(20); |
| 1113 | schedule_timeout(2*HZ/100); | ||
| 1114 | 1113 | ||
| 1115 | inb_p(io+0); | 1114 | inb_p(io+0); |
| 1116 | inb_p(io+2); | 1115 | inb_p(io+2); |
| @@ -1120,8 +1119,7 @@ struct net_device * __init ltpc_probe(void) | |||
| 1120 | inb_p(io+5); /* enable dma */ | 1119 | inb_p(io+5); /* enable dma */ |
| 1121 | inb_p(io+6); /* tri-state interrupt line */ | 1120 | inb_p(io+6); /* tri-state interrupt line */ |
| 1122 | 1121 | ||
| 1123 | set_current_state(TASK_UNINTERRUPTIBLE); | 1122 | ssleep(1); |
| 1124 | schedule_timeout(HZ); | ||
| 1125 | 1123 | ||
| 1126 | /* now, figure out which dma channel we're using, unless it's | 1124 | /* now, figure out which dma channel we're using, unless it's |
| 1127 | already been specified */ | 1125 | already been specified */ |