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/scsi/NCR53c406a.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/scsi/NCR53c406a.c')
| -rw-r--r-- | drivers/scsi/NCR53c406a.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c index 554863080..e13d8a632 100644 --- a/drivers/scsi/NCR53c406a.c +++ b/drivers/scsi/NCR53c406a.c @@ -656,10 +656,10 @@ static void internal_done(Scsi_Cmnd *SCpnt) { static void wait_intr() { int i = jiffies + WATCHDOG; - while(i>jiffies && !(inb(STAT_REG)&0xe0)) /* wait for a pseudo-interrupt */ + while(time_after(i,jiffies) && !(inb(STAT_REG)&0xe0)) /* wait for a pseudo-interrupt */ barrier(); - if (i <= jiffies) { /* Timed out */ + if (time_before_eq(i,jiffies)) { /* Timed out */ rtrc(0); current_SC->result = DID_TIME_OUT << 16; current_SC->SCp.phase = idle; @@ -983,9 +983,9 @@ static int irq_probe() /* Wait for the interrupt to occur */ i = jiffies + WATCHDOG; - while(i > jiffies && !(inb(STAT_REG) & 0x80)) + while(time_after(i, jiffies) && !(inb(STAT_REG) & 0x80)) barrier(); - if (i <= jiffies) { /* Timed out, must be hardware trouble */ + if (time_before_eq(i, jiffies)) { /* Timed out, must be hardware trouble */ probe_irq_off(irqs); return -1; } |