[PATCH] 2.5.59 : drivers/char/sx.c

[Frank Davis]

Hello all,
   The following patch addresses buzilla bug # 322, and removes a double 
logical issue. Please review for inclusion.

Regards,
Frank

--- linux/drivers/char/sx.c.old	2003-01-16 21:22:03.000000000 -0500
+++ linux/drivers/char/sx.c	2003-02-07 02:30:33.000000000 -0500
@@ -522,13 +522,13 @@
 
 	func_enter ();
 
-	for (i=0; i < TIMEOUT_1 > 0;i++) 
+	for (i=0; ((TIMEOUT_1 > 0) && (i < TIMEOUT_1));i++) 
 		if ((read_sx_byte (board, offset) & mask) == correctval) {
 			func_exit ();
 			return 1;
 		}
 
-	for (i=0; i < TIMEOUT_2 > 0;i++) {
+	for (i=0; ((TIMEOUT_2 > 0 ) && (i < TIMEOUT_2 > 0));i++) {
 		if ((read_sx_byte (board, offset) & mask) == correctval) {
 			func_exit ();
 			return 1;
@@ -548,13 +548,15 @@
 
 	func_enter ();
 
-	for (i=0; i < TIMEOUT_1 > 0;i++) 
+	for (i=0; ((TIMEOUT_1 > 0) && (i < TIMEOUT_1));i++) 
+		if ((read_sx_byte (board, offset) & mask) == correctval) {
 		if ((read_sx_byte (board, offset) & mask) != badval) {
 			func_exit ();
 			return 1;
 		}
 
-	for (i=0; i < TIMEOUT_2 > 0;i++) {
+	for (i=0; ((TIMEOUT_2 > 0 ) && (i < TIMEOUT_2 > 0));i++) {
+		if ((read_sx_byte (board, offset) & mask) == correctval) {
 		if ((read_sx_byte (board, offset) & mask) != badval) {
 			func_exit ();
 			return 1;