patch-2.2.0-pre1 linux/drivers/block/ide-probe.c

Next file: linux/drivers/block/ll_rw_blk.c
Previous file: linux/drivers/block/ide-floppy.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.132/linux/drivers/block/ide-probe.c linux/drivers/block/ide-probe.c
@@ -291,7 +291,7 @@
 			delay_50ms();
 			OUT_BYTE(WIN_SRST, IDE_COMMAND_REG);
 			timeout = jiffies;
-			while ((GET_STAT() & BUSY_STAT) && jiffies < timeout + WAIT_WORSTCASE)
+			while ((GET_STAT() & BUSY_STAT) && time_before(jiffies, timeout + WAIT_WORSTCASE))
 				delay_50ms();
 			rc = try_to_identify(drive, cmd);
 		}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov