---

yaml --- r: 290115 b: refs/heads/master c: 8649f43 h: refs/heads/master i: 290113: 0315aae 290111: 99ef40d v: v3
git-mirror · Feb 13, 2012 · 2db3e0d · 2db3e0d
1 parent 7800604
commit 2db3e0d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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);
 }
 
 /**