From 5702e38307a149384e3c5a3afaf4b9599b13080b Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 8 Feb 2012 02:55:30 +0000
Subject: [PATCH] --- yaml --- r: 290121 b: refs/heads/master c:
 f764956fd6c93be36cc60726ffd101d59fc3f581 h: refs/heads/master i:   290119:
 27ad3d9b9a7b9240e55964511135c1b8e6564e6b v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/phy.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1316379c21db..c8d7e870587a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55920b5eae24cfd2666f3f80bc5f2c0b3b18043b
+refs/heads/master: f764956fd6c93be36cc60726ffd101d59fc3f581
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/phy.c b/trunk/drivers/net/ethernet/intel/e1000e/phy.c
index a8b99bae0222..0e86c7e761ea 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1264,8 +1264,6 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
 						     PHY_FORCE_LIMIT,
 						     100000,
 						     &link);
-		if (ret_val)
-			return ret_val;
 	}
 
 	return ret_val;