From 9df060dd01e5d7075922fe31f7f8a5c52f45fdbb Mon Sep 17 00:00:00 2001
From: Mark Lord <liml@rtr.ca>
Date: Wed, 16 Apr 2008 15:01:19 -0400
Subject: [PATCH] --- yaml --- r: 89296 b: refs/heads/master c:
 094e50b2f74146d8ee924fea4808e58c4ed2f163 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/ata/sata_mv.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d104a9f2c52b..ae219f1429cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a74f1a4680614dfb77fc5dfd37d0ece13b2b357
+refs/heads/master: 094e50b2f74146d8ee924fea4808e58c4ed2f163
diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c
index 82632e7e34f0..05ff8c776497 100644
--- a/trunk/drivers/ata/sata_mv.c
+++ b/trunk/drivers/ata/sata_mv.c
@@ -2105,6 +2105,13 @@ static int mv6_reset_hc(struct mv_host_priv *hpriv, void __iomem *mmio,
 		printk(KERN_ERR DRV_NAME ": can't clear global reset\n");
 		rc = 1;
 	}
+	/*
+	 * Temporary: wait 3 seconds before port-probing can happen,
+	 * so that we don't miss finding sleepy SilXXXX port-multipliers.
+	 * This can go away once hotplug is fully/correctly implemented.
+	 */
+	if (rc == 0)
+		msleep(3000);
 done:
 	return rc;
 }