patch-2.2.0-pre2 linux/drivers/net/sdla.c

• Lines: 27
• Date: Tue Dec 29 11:32:06 1998
• Orig file: v2.2.0-pre1/linux/drivers/net/sdla.c
• Orig date: Sun Jun 7 11:16:32 1998

diff -u --recursive --new-file v2.2.0-pre1/linux/drivers/net/sdla.c linux/drivers/net/sdla.c
@@ -248,7 +248,7 @@
 	temp += z80_addr & SDLA_ADDR_MASK;
 	
 	resp = ~resp1;
-	while ((jiffies < done) && (resp != resp1) && (!resp2 || (resp != resp2)))
+	while (time_before(jiffies, done) && (resp != resp1) && (!resp2 || (resp != resp2)))
 	{
 		if (jiffies != now)
 		{
@@ -257,7 +257,7 @@
 			resp = *temp;
 		}
 	}
-	return(jiffies < done ? jiffies - start : -1);
+	return(time_before(jiffies, done) ? jiffies - start : -1);
 }
 
 /* constants for Z80 CPU speed */
@@ -444,7 +444,7 @@
 
 	waiting = 1;
 	len = 0;
-	while (waiting && (jiffies <= jiffs))
+	while (waiting && time_before_eq(jiffies, jiffs))
 	{
 		if (waiting++ % 3) 
 		{