From 5cf17eeb53332b589cf12713deee6e73f47848c9 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 21 Oct 2008 20:37:21 +0900
Subject: [PATCH] --- yaml --- r: 116831 b: refs/heads/master c:
 a568d1d2e2aff4f114b087c06bfd350e945ad6cf h: refs/heads/master i:   116829:
 819baeec4a9dd537702604f0a4853f40f8f569ae   116827:
 de0a851567304c5c9afab74b1e4b32776e9f29ef   116823:
 d0e09c79e0b327ee0606c8895ec170ae23da0f7e   116815:
 88a1c22cb3285f0ffe3b727d1d2a0a6d2a6b1a16   116799:
 8d3ea714a0e1029902270e903268a2c2ed023732 v: v3

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

diff --git a/[refs] b/[refs]
index ac44aef5b0f0..effb3f9389ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 848e4c68c4695beae563f9a3d59fce596b466a74
+refs/heads/master: a568d1d2e2aff4f114b087c06bfd350e945ad6cf
diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c
index d2409a8acece..7ccd0ce0e7d4 100644
--- a/trunk/drivers/ata/libata-eh.c
+++ b/trunk/drivers/ata/libata-eh.c
@@ -1206,7 +1206,10 @@ void ata_eh_about_to_do(struct ata_link *link, struct ata_device *dev,
 
 	ata_eh_clear_action(link, dev, ehi, action);
 
-	if (!(ehc->i.flags & ATA_EHI_QUIET))
+	/* About to take EH action, set RECOVERED.  Ignore actions on
+	 * slave links as master will do them again.
+	 */
+	if (!(ehc->i.flags & ATA_EHI_QUIET) && link != ap->slave_link)
 		ap->pflags |= ATA_PFLAG_RECOVERED;
 
 	spin_unlock_irqrestore(ap->lock, flags);