patch-2.2.0-pre1 linux/drivers/acorn/block/fd1772.c

• Lines: 18
• Date: Wed Dec 23 09:44:40 1998
• Orig file: v2.1.132/linux/drivers/acorn/block/fd1772.c
• Orig date: Wed Aug 26 11:37:34 1998

diff -u --recursive --new-file v2.1.132/linux/drivers/acorn/block/fd1772.c linux/drivers/acorn/block/fd1772.c
@@ -1090,7 +1090,7 @@
 	NeedSeek = 0;
 
 	if ((timer_active & (1 << FLOPPY_TIMER)) &&
-	    timer_table[FLOPPY_TIMER].expires < jiffies + 5)
+	    time_after(jiffies + 5, timer_table[FLOPPY_TIMER].expires)) 
 		/* If the check for a disk change is done too early after this
 		 * last seek command, the WP bit still reads wrong :-((
 		 */
@@ -1424,7 +1424,7 @@
 	FDC1772_WRITE(FDC1772REG_CMD, FDC1772CMD_RESTORE | FDC1772CMDADD_H | FDC1772STEP_6);
 
 	/*printk("fd_test_drive_present: Going into timeout loop\n"); */
-	for (ok = 0, timeout = jiffies + 2 * HZ + HZ / 2; jiffies < timeout;) {
+	for (ok = 0, timeout = jiffies + 2 * HZ + HZ / 2; time_before(jiffies, timeout);) {
 		/*  What does this piece of atariism do? - query for an interrupt? */
 		/*  if (!(mfp.par_dt_reg & 0x20))
 		   break; */