diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 19:19:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 19:19:20 -0500 |
| commit | 03a49eebcaa3486f4ac2c50db83aab996ce5ad9b (patch) | |
| tree | a92d8a6b3806ec3416ca2b28c45174fca9c4833e /drivers/net/zorro8390.c | |
| parent | d4fbeabbc9e68c80738fe59135d201c3ed5fe40f (diff) | |
| parent | 26df54bffd90977fbc6fe8284f2beaed19fea44f (diff) | |
| download | kernel-crypto-03a49eebcaa3486f4ac2c50db83aab996ce5ad9b.tar.gz kernel-crypto-03a49eebcaa3486f4ac2c50db83aab996ce5ad9b.tar.xz kernel-crypto-03a49eebcaa3486f4ac2c50db83aab996ce5ad9b.zip | |
Merge branch 'janitor'
Diffstat (limited to 'drivers/net/zorro8390.c')
| -rw-r--r-- | drivers/net/zorro8390.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c index 8ab6e12153b..76102160359 100644 --- a/drivers/net/zorro8390.c +++ b/drivers/net/zorro8390.c @@ -27,6 +27,7 @@ #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/zorro.h> +#include <linux/jiffies.h> #include <asm/system.h> #include <asm/irq.h> @@ -151,7 +152,7 @@ static int __devinit zorro8390_init(struct net_device *dev, z_writeb(z_readb(ioaddr + NE_RESET), ioaddr + NE_RESET); while ((z_readb(ioaddr + NE_EN0_ISR) & ENISR_RESET) == 0) - if (jiffies - reset_start_time > 2*HZ/100) { + if (time_after(jiffies, reset_start_time + 2*HZ/100)) { printk(KERN_WARNING " not found (no reset ack).\n"); return -ENODEV; } @@ -273,7 +274,7 @@ static void zorro8390_reset_8390(struct net_device *dev) /* This check _should_not_ be necessary, omit eventually. */ while ((z_readb(NE_BASE+NE_EN0_ISR) & ENISR_RESET) == 0) - if (jiffies - reset_start_time > 2*HZ/100) { + if (time_after(jiffies, reset_start_time + 2*HZ/100)) { printk(KERN_WARNING "%s: ne_reset_8390() did not complete.\n", dev->name); break; @@ -400,7 +401,7 @@ static void zorro8390_block_output(struct net_device *dev, int count, dma_start = jiffies; while ((z_readb(NE_BASE + NE_EN0_ISR) & ENISR_RDC) == 0) - if (jiffies - dma_start > 2*HZ/100) { /* 20ms */ + if (time_after(jiffies, dma_start + 2*HZ/100)) { /* 20ms */ printk(KERN_ERR "%s: timeout waiting for Tx RDC.\n", dev->name); zorro8390_reset_8390(dev); |