X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fnet%2Ftyphoon.c;h=4c76cb794bfbb48ad0a5c4954cd85ee8324156ee;hb=e7e37ee9c547213d726b29c2510cbb6696050405;hp=ecfa6f8805ce0ef050448e777e68364b7d50a32e;hpb=c1b054d03f5b31c33eaa0b267c629b118eaf3790;p=karo-tx-linux.git diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index ecfa6f8805ce..4c76cb794bfb 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -419,10 +419,9 @@ typhoon_reset(void __iomem *ioaddr, int wait_type) TYPHOON_STATUS_WAITING_FOR_HOST) goto out; - if(wait_type == WaitSleep) { - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(1); - } else + if(wait_type == WaitSleep) + schedule_timeout_uninterruptible(1); + else udelay(TYPHOON_UDELAY); }