patch-2.1.43 linux/drivers/block/ide.c

• Lines: 60
• Date: Thu Jun 12 16:22:06 1997
• Orig file: v2.1.42/linux/drivers/block/ide.c
• Orig date: Tue May 13 22:41:05 1997

diff -u --recursive --new-file v2.1.42/linux/drivers/block/ide.c linux/drivers/block/ide.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/block/ide.c	Version 6.02  Mar  11, 1997
+ *  linux/drivers/block/ide.c	Version 6.03  June 4, 1997
  *
  *  Copyright (C) 1994-1997  Linus Torvalds & authors (see below)
  */
@@ -280,6 +280,7 @@
  *			support HDIO_GETGEO for floppies
  * Version 6.02		fix ide_ack_intr() call
  *			check partition table on floppies
+ * Version 6.03		handle bad status bit sequencing in ide_wait_stat()
  *
  *  Some additional driver compile-time options are in ide.h
  *
@@ -1044,27 +1045,24 @@
 	byte stat;
 	unsigned long flags;
 
-test:
-	udelay(1);	/* spec allows drive 400ns to change "BUSY" */
-	if (OK_STAT((stat = GET_STAT()), good, bad))
-		return 0;	/* fast exit for most frequent case */
-	if (!(stat & BUSY_STAT)) {
-		ide_error(drive, "status error", stat);
-		return 1;
-	}
-
-	save_flags(flags);
-	ide_sti();
-	timeout += jiffies;
-	do {
-		if (!((stat = GET_STAT()) & BUSY_STAT)) {
-			restore_flags(flags);
-			goto test;
+	udelay(1);	/* spec allows drive 400ns to assert "BUSY" */
+	if ((stat = GET_STAT()) & BUSY_STAT) {
+		save_flags(flags);
+		ide_sti();
+		timeout += jiffies;
+		while ((stat = GET_STAT()) & BUSY_STAT) {
+			if (jiffies > timeout) {
+				restore_flags(flags);
+				ide_error(drive, "status timeout", stat);
+				return 1;
+			}
 		}
-	} while (jiffies <= timeout);
-
-	restore_flags(flags);
-	ide_error(drive, "status timeout", GET_STAT());
+		restore_flags(flags);
+	}
+	udelay(1);	/* allow status to settle, then read it again */
+	if (OK_STAT((stat = GET_STAT()), good, bad))
+		return 0;
+	ide_error(drive, "status error", stat);
 	return 1;
 }