From 849716c86ec6f2930c27fe25a79918c553a83fef Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 31 Jul 2008 16:07:04 +0900
Subject: [PATCH] --- yaml --- r: 109020 b: refs/heads/master c:
 a674050e068a2919908730279f0b731ae6d2e005 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/ata/libata-eh.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index adf3cb84ad29..ca40eb65e175 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb3a55a9f43f0f8e770c2abf70e65bdda2d5ff1e
+refs/heads/master: a674050e068a2919908730279f0b731ae6d2e005
diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c
index a570ca47e239..c98909ba0b1c 100644
--- a/trunk/drivers/ata/libata-eh.c
+++ b/trunk/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) {