From 1dca4255866c1c38f8fd6847674e5b1a8b1fccbe Mon Sep 17 00:00:00 2001
From: Eli Cohen <eli@mellanox.co.il>
Date: Mon, 13 Aug 2007 17:57:03 +0300
Subject: [PATCH] --- yaml --- r: 64103 b: refs/heads/master c:
 947b2a8083a03e6fff448ce8928956015614855e h: refs/heads/master i:   64101:
 8cee32a431158085d5abe88965c87ac0aa17d169   64099:
 d62d7e62b7e8ab156f17b002172148e486ea5149   64095:
 9c8198380422eff89f6e0532283bde98ba20519e v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/mlx4/reset.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 60246775f3ea..a32fc021b9b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6958e827f187c9c5cd39af075567f74f02bf3dd1
+refs/heads/master: 947b2a8083a03e6fff448ce8928956015614855e
diff --git a/trunk/drivers/net/mlx4/reset.c b/trunk/drivers/net/mlx4/reset.c
index e4dfd4b11a4a..e199715fabd0 100644
--- a/trunk/drivers/net/mlx4/reset.c
+++ b/trunk/drivers/net/mlx4/reset.c
@@ -119,6 +119,9 @@ int mlx4_reset(struct mlx4_dev *dev)
 	writel(MLX4_RESET_VALUE, reset + MLX4_RESET_OFFSET);
 	iounmap(reset);
 
+	/* Docs say to wait one second before accessing device */
+	msleep(1000);
+
 	end = jiffies + MLX4_RESET_TIMEOUT_JIFFIES;
 	do {
 		if (!pci_read_config_word(dev->pdev, PCI_VENDOR_ID, &vendor) &&