summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-07-03 02:54:58 +0900
committerJeff Garzik <jeff@garzik.org>2006-07-05 21:51:42 -0400
commit0662c58b3265f52f708a6d59476bc7862b01f9c0 (patch)
tree2be67b2206da998fe51b40946d351c99cc888f9c
parentb51e9e5db0e36239f786692f1cac6e435ed30c66 (diff)
downloadlinux-stable-0662c58b3265f52f708a6d59476bc7862b01f9c0.tar.gz
linux-stable-0662c58b3265f52f708a6d59476bc7862b01f9c0.tar.bz2
linux-stable-0662c58b3265f52f708a6d59476bc7862b01f9c0.zip
[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.c2
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)
/* record autopsy result */
ehc->i.dev = failed_dev;
- ehc->i.action = action;
+ ehc->i.action |= action;
DPRINTK("EXIT\n");
}