From 93891754f369d8dfa5b3e9add189b0919739251d Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Tue, 23 Jun 2009 09:00:01 +0000
Subject: [PATCH] --- yaml --- r: 154113 b: refs/heads/master c:
 e5a673742e34eca8ecb13c3e54ceee2c268351a0 h: refs/heads/master i:   154111:
 51a4ebf1ce62f2681a7a73c1373fd125a609a339 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/qla3xxx.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 423bded576fe..74530f96d0bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6280b47a7a42970d098a3059f4ebe7e55e90d8d
+refs/heads/master: e5a673742e34eca8ecb13c3e54ceee2c268351a0
diff --git a/trunk/drivers/net/qla3xxx.c b/trunk/drivers/net/qla3xxx.c
index bbc6d4d3cc94..68be714d356f 100644
--- a/trunk/drivers/net/qla3xxx.c
+++ b/trunk/drivers/net/qla3xxx.c
@@ -3150,7 +3150,8 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
 	ql_write_common_reg(qdev, &port_regs->CommonRegs.serialPortInterfaceReg,
 			    (ISP_SERIAL_PORT_IF_WE |
 			     (ISP_SERIAL_PORT_IF_WE << 16)));
-
+	/* Give the PHY time to come out of reset. */
+	mdelay(100);
 	qdev->port_link_state = LS_DOWN;
 	netif_carrier_off(qdev->ndev);