From 69ba359041a396adad675f38a0449adcb55d95da Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 3 Jan 2008 01:21:14 +0900 Subject: [PATCH] --- yaml --- r: 76925 b: refs/heads/master c: 75f9cafc2d24a1cf44d7c3f3e5b4f7a393afcf71 h: refs/heads/master i: 76923: 0437e4d19ae9770c145a34575a3f463eebf6df33 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-eh.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 02220025e394..ef006a05c852 100644 --- 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 index 419552603a16..4e31071acc02 100644 --- 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;