diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/net/dgrs.c | |
parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/net/dgrs.c')
-rw-r--r-- | drivers/net/dgrs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index c379b3a43..2d4e08482 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c @@ -1098,7 +1098,7 @@ dgrs_download(struct device *dev0)) */ proc_reset(dev0, 0); - for (i = jiffies + 8 * HZ; i > jiffies; ) + for (i = jiffies + 8 * HZ; time_after(i, jiffies); ) { if (priv0->bcomm->bc_status >= BC_RUN) break; @@ -1196,7 +1196,7 @@ dgrs_probe1(struct device *dev)) return (rc); priv->intrcnt = 0; - for (i = jiffies + 2*HZ + HZ/2; i > jiffies; ) + for (i = jiffies + 2*HZ + HZ/2; time_after(i, jiffies); ) if (priv->intrcnt >= 2) break; if (priv->intrcnt < 2) |