---

yaml --- r: 18795 b: refs/heads/master c: 7892f59 h: refs/heads/master i: 18793: 37dc57b 18791: fe08acd v: v3
git-mirror · Jan 17, 2006 · 0e05918 · 0e05918
1 parent 1760ffe
commit 0e05918
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39
+refs/heads/master: 7892f59c5ea86115450293441ca10654168e00da
diff --git a/trunk/drivers/net/e1000/e1000_hw.c b/trunk/drivers/net/e1000/e1000_hw.c
@@ -6722,6 +6722,12 @@ e1000_get_phy_cfg_done(struct e1000_hw *hw)
         break;
     }
 
+    /* PHY configuration from NVM just starts after EECD_AUTO_RD sets to high.
+     * Need to wait for PHY configuration completion before accessing NVM
+     * and PHY. */
+    if (hw->mac_type == e1000_82573)
+        msec_delay(25);
+
     return E1000_SUCCESS;
 }