patch-2.2.0-pre2 linux/drivers/scsi/seagate.c

Next file: linux/drivers/scsi/wd7000.c
Previous file: linux/drivers/scsi/scsi.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre1/linux/drivers/scsi/seagate.c linux/drivers/scsi/seagate.c
@@ -379,8 +379,8 @@
 {
   register int count = 0, start = jiffies + 1, stop = start + 25;
 
-  while (jiffies < start) ;
-  for (; jiffies < stop; ++count) ;
+  while (time_before(jiffies, start)) ;
+  for (; time_before(jiffies, stop); ++count) ;
 
 /*
  * Ok, we now have a count for .25 seconds.  Convert to a
@@ -903,9 +903,9 @@
 
       while (((STATUS | STATUS | STATUS) &
               (STAT_BSY | STAT_SEL)) &&
-             (!st0x_aborted) && (jiffies < clock));
+             (!st0x_aborted) && time_before(jiffies, clock));
 
-      if (jiffies > clock)
+      if (time_after(jiffies, clock))
         return retcode (DID_BUS_BUSY);
       else if (st0x_aborted)
         return retcode (st0x_aborted);

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