Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.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)
         writew(readw(streamer_mmio + BCTL) | BCTL_SOFTRESET, streamer_mmio + BCTL);
         t = jiffies;
         /* Hold soft reset bit for a while */
-        current->state = TASK_UNINTERRUPTIBLE;
-        schedule_timeout(HZ);
+        ssleep(1);
         
         writew(readw(streamer_mmio + BCTL) & ~BCTL_SOFTRESET,
                streamer_mmio + BCTL);
@@ -512,8 +511,7 @@ static int streamer_reset(struct net_device *dev)
         writew(SISR_MI, streamer_mmio + SISR_MASK_SUM);
 
         while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) {
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(HZ/10);
+                msleep_interruptible(100);
                 if (jiffies - t > 40 * HZ) {
                         printk(KERN_ERR
                                "IBM PCI tokenring card not responding\n");