From f258c19701508d0e601c2bae2fd80b5974f6f2e0 Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Fri, 21 Nov 2008 16:49:53 -0800
Subject: [PATCH] --- yaml --- r: 121977 b: refs/heads/master c:
 5aa49c82118d2aa08c6cfaba01fd86f969b3f1d7 h: refs/heads/master i:   121975:
 688492f366b7f2e1de2c6d5edef2e8d4ed3d8c15 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/e1000e/phy.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 45b47ccbd2c8..d71f8c21a0e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 005cbdfc29cfc23b8faadd3619eed43e6550bfc1
+refs/heads/master: 5aa49c82118d2aa08c6cfaba01fd86f969b3f1d7
diff --git a/trunk/drivers/net/e1000e/phy.c b/trunk/drivers/net/e1000e/phy.c
index 6cd333ae61d0..cb7d71e458e4 100644
--- a/trunk/drivers/net/e1000e/phy.c
+++ b/trunk/drivers/net/e1000e/phy.c
@@ -1030,14 +1030,14 @@ s32 e1000e_phy_force_speed_duplex_m88(struct e1000_hw *hw)
 
 	e1000e_phy_force_speed_duplex_setup(hw, &phy_data);
 
-	/* Reset the phy to commit changes. */
-	phy_data |= MII_CR_RESET;
-
 	ret_val = e1e_wphy(hw, PHY_CONTROL, phy_data);
 	if (ret_val)
 		return ret_val;
 
-	udelay(1);
+	/* Reset the phy to commit changes. */
+	ret_val = e1000e_commit_phy(hw);
+	if (ret_val)
+		return ret_val;
 
 	if (phy->autoneg_wait_to_complete) {
 		hw_dbg(hw, "Waiting for forced speed/duplex link on M88 phy.\n");