[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 f2f29a8bc38e65aaf6166bc6966433247db8cfd2..4a670db9aa05691d8776efbd2006f18a7720297f 100644 (file)
--- 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");
 }