From e22958c85b8166e36d9ee7b7805ab3e61406a10c Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 15 Oct 2009 23:37:32 +0900
Subject: [PATCH] --- yaml --- r: 167643 b: refs/heads/master c:
 4f7c2874995ac48a4622755b8bd159eb2fb6d8f4 h: refs/heads/master i:   167641:
 df2753e4f93c7577e9364fda67af6be0dd3cccf8   167639:
 5a08e00d826b06c8f309fd1eda7b27a44122169e v: v3

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

diff --git a/[refs] b/[refs]
index cac72132b63e..b25d830bc5b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6489e3262e6b188a1a009b65e8a94b7aa17645b7
+refs/heads/master: 4f7c2874995ac48a4622755b8bd159eb2fb6d8f4
diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c
index 0a97822da211..bba2ae5df1c2 100644
--- a/trunk/drivers/ata/libata-eh.c
+++ b/trunk/drivers/ata/libata-eh.c
@@ -2981,12 +2981,14 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,
 	 * device detection messages backwards.
 	 */
 	ata_for_each_dev(dev, link, ALL) {
-		if (!(new_mask & (1 << dev->devno)) ||
-		    dev->class == ATA_DEV_PMP)
+		if (!(new_mask & (1 << dev->devno)))
 			continue;
 
 		dev->class = ehc->classes[dev->devno];
 
+		if (dev->class == ATA_DEV_PMP)
+			continue;
+
 		ehc->i.flags |= ATA_EHI_PRINTINFO;
 		rc = ata_dev_configure(dev);
 		ehc->i.flags &= ~ATA_EHI_PRINTINFO;