diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 23:59:42 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 23:59:42 +0400 |
| commit | 70d374ea9907036e15574a5ce89219edd5baee10 (patch) | |
| tree | b858bb4a841eb91b1d91b41c33698d05fa7bfb37 /drivers/net/hamradio/baycom_par.c | |
| parent | aa7e16d6b88b3b38db0d2ee49ed5e44e7b2045ec (diff) | |
| parent | bf4e70e54cf31dcca48d279c7f7e71328eebe749 (diff) | |
| download | linux-70d374ea9907036e15574a5ce89219edd5baee10.tar.xz | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/hamradio/baycom_par.c')
| -rw-r--r-- | drivers/net/hamradio/baycom_par.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index 612ad452bee0..3b1bef1ee215 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c @@ -84,6 +84,7 @@ #include <linux/baycom.h> #include <linux/parport.h> #include <linux/bitops.h> +#include <linux/jiffies.h> #include <asm/bug.h> #include <asm/system.h> @@ -165,7 +166,7 @@ static void __inline__ baycom_int_freq(struct baycom_state *bc) * measure the interrupt frequency */ bc->debug_vals.cur_intcnt++; - if ((cur_jiffies - bc->debug_vals.last_jiffies) >= HZ) { + if (time_after_eq(cur_jiffies, bc->debug_vals.last_jiffies + HZ)) { bc->debug_vals.last_jiffies = cur_jiffies; bc->debug_vals.last_intcnt = bc->debug_vals.cur_intcnt; bc->debug_vals.cur_intcnt = 0; |