From 2db3e0d7a3ba3c96263f62feec2e277b1c31e5dd Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 8 Feb 2012 02:54:58 +0000
Subject: [PATCH] --- yaml --- r: 290115 b: refs/heads/master c:
 8649f4319656f9fcaa59726799a824254b0a1bce h: refs/heads/master i:   290113:
 0315aae51b21ec1702af33f645abc1dba1f03782   290111:
 99ef40d11ab54d2babe9abe74f55b7254a0aab3d v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/80003es2lan.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d74929611cbd..963fa9a718b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 520d6f225f83128e9ea083a9a226f807235cc76c
+refs/heads/master: 8649f4319656f9fcaa59726799a824254b0a1bce
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/trunk/drivers/net/ethernet/intel/e1000e/80003es2lan.c
index 37e78649c710..99eb09007e73 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/80003es2lan.c
@@ -1147,9 +1147,7 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw)
 	if (ret_val)
 		return ret_val;
 
-	ret_val = e1000e_setup_copper_link(hw);
-
-	return 0;
+	return e1000e_setup_copper_link(hw);
 }
 
 /**