[PATCH] libata: fix ehc->i.action setting in ata_eh_autopsy()
authorTejun Heo <htejun@gmail.com>
Sun, 2 Jul 2006 17:54:58 +0000 (02:54 +0900)
committerJeff Garzik <jeff@garzik.org>
Thu, 6 Jul 2006 01:51:42 +0000 (21:51 -0400)
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>
drivers/scsi/libata-eh.c

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