From: Tejun Heo <htejun@gmail.com>
Date: Sun, 2 Jul 2006 17:54:58 +0000 (+0900)
Subject: [PATCH] libata: fix ehc->i.action setting in ata_eh_autopsy()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0662c58b3265f52f708a6d59476bc7862b01f9c0;p=mv-sheeva.git

[PATCH] libata: fix ehc->i.action setting in ata_eh_autopsy()

ata_eh_autopsy() used to directly assign determined action mask to
ehc->i.action thus overriding actions set by some of nested analyze
functions.  This patch makes ata_eh_autopsy() add action masks just as
it's done in other places.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index f2f29a8bc38..4a670db9aa0 100644
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c
@@ -1346,7 +1346,7 @@ static void ata_eh_autopsy(struct ata_port *ap)
 
 	/* record autopsy result */
 	ehc->i.dev = failed_dev;
-	ehc->i.action = action;
+	ehc->i.action |= action;
 
 	DPRINTK("EXIT\n");
 }