summaryrefslogtreecommitdiffstats
path: root/drivers/net/appletalk
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@us.ibm.com>2005-06-22 22:19:52 -0700
committerDavid S. Miller <davem@davemloft.net>2005-06-22 22:19:52 -0700
commit2c4ee8f907fc4a3c69273a958f853bf4b358eb49 (patch)
tree79d56bc6cc1575111f7ffcee74067ecfa946f16e /drivers/net/appletalk
parentebc3f64b864fc16a594c2e63bf55a55c7d42084b (diff)
downloadop-kernel-dev-2c4ee8f907fc4a3c69273a958f853bf4b358eb49.zip
op-kernel-dev-2c4ee8f907fc4a3c69273a958f853bf4b358eb49.tar.gz
[LTPC]: Replace schedule_timeout() with ssleep()/msleep()
Use ssleep() / msleep() [as appropriate] instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Acked-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/appletalk')
-rw-r--r--drivers/net/appletalk/ltpc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index db4f369..d5666c37 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 */
OpenPOWER on IntegriCloud