1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 99e0b03b69a8..97712c3c4e07 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -118,6 +118,7 @@
 #include <linux/stddef.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
 #include <linux/version.h>
 #include <linux/bitops.h>
@@ -257,7 +258,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
 #endif
 #endif
 
-        rc = pci_set_dma_mask(pdev, 0xFFFFFFFFULL);
+        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
         if (rc) {
                 printk(KERN_ERR "%s: No suitable PCI mapping available.\n",
                                 dev->name);
@@ -454,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);
@@ -511,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");