From 7d43ef9826bb2a6a26abd12e1e7d348458c8ff4f Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 19 May 2008 01:15:09 +0900 Subject: [PATCH] --- yaml --- r: 96951 b: refs/heads/master c: e0614db2a398d4d0dc5fb47fe2c2783141262a3e h: refs/heads/master i: 96949: 48559ab6f97d07e7925fdff1020616b444913bfc 96947: cb4b6dcaa2f06b4b24a2fe7c855969ced17cbcba 96943: 39a8cf97ef8c6c0e74d1f6178b50dfafa30b6be3 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-eh.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 900c851c1bfa..da08893e8e8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f046519fc85a8fdf6a058b4ac9d897cdee6f3e52 +refs/heads/master: e0614db2a398d4d0dc5fb47fe2c2783141262a3e diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c index 751dad0138ae..7894d83ea1eb 100644 --- a/trunk/drivers/ata/libata-eh.c +++ b/trunk/drivers/ata/libata-eh.c @@ -1308,12 +1308,7 @@ static void ata_eh_analyze_serror(struct ata_link *link) unsigned int err_mask = 0, action = 0; u32 hotplug_mask; - if (serror & SERR_PERSISTENT) { - err_mask |= AC_ERR_ATA_BUS; - action |= ATA_EH_RESET; - } - if (serror & - (SERR_DATA_RECOVERED | SERR_COMM_RECOVERED | SERR_DATA)) { + if (serror & (SERR_PERSISTENT | SERR_DATA)) { err_mask |= AC_ERR_ATA_BUS; action |= ATA_EH_RESET; }