From: Tejun Heo <tj@kernel.org>
Date: Thu, 31 Jul 2008 07:07:04 +0000 (+0900)
Subject: libata: fix EH action overwriting in ata_eh_reset()
X-Git-Tag: v2.6.27-rc5~51^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a674050e068a2919908730279f0b731ae6d2e005;p=linux-2.6-omap-h63xx.git

libata: fix EH action overwriting in ata_eh_reset()

ehc->i.action got accidentally overwritten to ATA_EH_HARD/SOFTRESET in
ata_eh_reset().  The original intention was to clear reset action
which wasn't selected.  This can cause unexpected behavior when other
EH actions are scheduled together with reset.  Fix it.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index a570ca47e23..c98909ba0b1 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2251,10 +2251,10 @@ int ata_eh_reset(struct ata_link *link, int classify,
 	ehc->i.action &= ~ATA_EH_RESET;
 	if (hardreset) {
 		reset = hardreset;
-		ehc->i.action = ATA_EH_HARDRESET;
+		ehc->i.action |= ATA_EH_HARDRESET;
 	} else if (softreset) {
 		reset = softreset;
-		ehc->i.action = ATA_EH_SOFTRESET;
+		ehc->i.action |= ATA_EH_SOFTRESET;
 	}
 
 	if (prereset) {