diff options
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.c')
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 6e5ade99a38f..97712c3c4e07 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -455,8 +455,7 @@ static int streamer_reset(struct net_device *dev) | |||
455 | writew(readw(streamer_mmio + BCTL) | BCTL_SOFTRESET, streamer_mmio + BCTL); | 455 | writew(readw(streamer_mmio + BCTL) | BCTL_SOFTRESET, streamer_mmio + BCTL); |
456 | t = jiffies; | 456 | t = jiffies; |
457 | /* Hold soft reset bit for a while */ | 457 | /* Hold soft reset bit for a while */ |
458 | current->state = TASK_UNINTERRUPTIBLE; | 458 | ssleep(1); |
459 | schedule_timeout(HZ); | ||
460 | 459 | ||
461 | writew(readw(streamer_mmio + BCTL) & ~BCTL_SOFTRESET, | 460 | writew(readw(streamer_mmio + BCTL) & ~BCTL_SOFTRESET, |
462 | streamer_mmio + BCTL); | 461 | streamer_mmio + BCTL); |
@@ -512,8 +511,7 @@ static int streamer_reset(struct net_device *dev) | |||
512 | writew(SISR_MI, streamer_mmio + SISR_MASK_SUM); | 511 | writew(SISR_MI, streamer_mmio + SISR_MASK_SUM); |
513 | 512 | ||
514 | while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) { | 513 | while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) { |
515 | current->state = TASK_INTERRUPTIBLE; | 514 | msleep_interruptible(100); |
516 | schedule_timeout(HZ/10); | ||
517 | if (jiffies - t > 40 * HZ) { | 515 | if (jiffies - t > 40 * HZ) { |
518 | printk(KERN_ERR | 516 | printk(KERN_ERR |
519 | "IBM PCI tokenring card not responding\n"); | 517 | "IBM PCI tokenring card not responding\n"); |