diff options
Diffstat (limited to 'drivers/net/tokenring/lanstreamer.c')
| -rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 97712c3c4e07..c58a4c31d0dd 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
| @@ -122,6 +122,7 @@ | |||
| 122 | #include <linux/spinlock.h> | 122 | #include <linux/spinlock.h> |
| 123 | #include <linux/version.h> | 123 | #include <linux/version.h> |
| 124 | #include <linux/bitops.h> | 124 | #include <linux/bitops.h> |
| 125 | #include <linux/jiffies.h> | ||
| 125 | 126 | ||
| 126 | #include <net/checksum.h> | 127 | #include <net/checksum.h> |
| 127 | 128 | ||
| @@ -512,7 +513,7 @@ static int streamer_reset(struct net_device *dev) | |||
| 512 | 513 | ||
| 513 | while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) { | 514 | while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) { |
| 514 | msleep_interruptible(100); | 515 | msleep_interruptible(100); |
| 515 | if (jiffies - t > 40 * HZ) { | 516 | if (time_after(jiffies, t + 40 * HZ)) { |
| 516 | printk(KERN_ERR | 517 | printk(KERN_ERR |
| 517 | "IBM PCI tokenring card not responding\n"); | 518 | "IBM PCI tokenring card not responding\n"); |
| 518 | release_region(dev->base_addr, STREAMER_IO_SPACE); | 519 | release_region(dev->base_addr, STREAMER_IO_SPACE); |
