diff options
author | Tejun Heo <htejun@gmail.com> | 2006-07-02 13:54:58 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-07-05 21:51:42 -0400 |
commit | 0662c58b3265f52f708a6d59476bc7862b01f9c0 (patch) | |
tree | 2be67b2206da998fe51b40946d351c99cc888f9c | |
parent | b51e9e5db0e36239f786692f1cac6e435ed30c66 (diff) |
[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>
-rw-r--r-- | drivers/scsi/libata-eh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c index f2f29a8bc38e..4a670db9aa05 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) | |||
1346 | 1346 | ||
1347 | /* record autopsy result */ | 1347 | /* record autopsy result */ |
1348 | ehc->i.dev = failed_dev; | 1348 | ehc->i.dev = failed_dev; |
1349 | ehc->i.action = action; | 1349 | ehc->i.action |= action; |
1350 | 1350 | ||
1351 | DPRINTK("EXIT\n"); | 1351 | DPRINTK("EXIT\n"); |
1352 | } | 1352 | } |