---

yaml --- r: 290125 b: refs/heads/master c: 2a31b37 h: refs/heads/master i: 290123: 24c1bfa v: v3
git-mirror · Feb 13, 2012 · a788d13 · a788d13
1 parent 0830dbf
commit a788d13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e561a705a61e8d4c32a1259c611703a3976347aa
+refs/heads/master: 2a31b37a8956154df099400ba93cd6898a629c6d
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/mac.c b/trunk/drivers/net/ethernet/intel/e1000e/mac.c
@@ -922,7 +922,7 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
 		e_dbg("No signal detected\n");
 	}
 
-	return 0;
+	return ret_val;
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -922,7 +922,7 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw) @@
     		e_dbg("No signal detected\n");
     	}
-    	return 0;
+    	return ret_val;
     }
     /**
@@ Expand Down @@