---

yaml --- r: 76925 b: refs/heads/master c: 75f9caf h: refs/heads/master i: 76923: 0437e4d v: v3
git-mirror · Jan 23, 2008 · 69ba359 · 69ba359
1 parent 3d69fb1
commit 69ba359
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b710a1f4b34438b624e9c6c2dc8bcf54b0b0ba27
+refs/heads/master: 75f9cafc2d24a1cf44d7c3f3e5b4f7a393afcf71
diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c
@@ -61,12 +61,11 @@ enum {
 	ATA_ECAT_ATA_BUS		= 1,
 	ATA_ECAT_TOUT_HSM		= 2,
 	ATA_ECAT_UNK_DEV		= 3,
-	ATA_ECAT_DUBIOUS_ATA_BUS	= 4,
-	ATA_ECAT_DUBIOUS_TOUT_HSM	= 5,
-	ATA_ECAT_DUBIOUS_UNK_DEV	= 6,
-	ATA_ECAT_NR			= 7,
-
-	ATA_ECAT_DUBIOUS_BASE		= ATA_ECAT_DUBIOUS_ATA_BUS,
+	ATA_ECAT_DUBIOUS_NONE		= 4,
+	ATA_ECAT_DUBIOUS_ATA_BUS	= 5,
+	ATA_ECAT_DUBIOUS_TOUT_HSM	= 6,
+	ATA_ECAT_DUBIOUS_UNK_DEV	= 7,
+	ATA_ECAT_NR			= 8,
 };
 
 /* Waiting in ->prereset can never be reliable.  It's sometimes nice
@@ -1499,7 +1498,7 @@ static int ata_eh_categorize_error(unsigned int eflags, unsigned int err_mask,
 		*xfer_ok = 1;
 
 	if (!*xfer_ok)
-		base = ATA_ECAT_DUBIOUS_BASE;
+		base = ATA_ECAT_DUBIOUS_NONE;
 
 	if (err_mask & AC_ERR_ATA_BUS)
 		return base + ATA_ECAT_ATA_BUS;