---

yaml --- r: 351407 b: refs/heads/master c: 8e5ab42 h: refs/heads/master i: 351405: b280aba 351403: 70abbca 351399: 481277b 351391: cdc021a v: v3
git-mirror · Jan 16, 2013 · 8b6a0a9 · 8b6a0a9
1 parent d012f74
commit 8b6a0a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12d43f7d3cd36494a442dea6f2d2c7ccb76d0d80
+refs/heads/master: 8e5ab42d7fdd73b11a6b6b58b4a7b26931c73385
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -2077,6 +2077,8 @@ static s32 e1000_lv_phy_workarounds_ich8lan(struct e1000_hw *hw)
 
 	/* Set MDIO slow mode before any other MDIO access */
 	ret_val = e1000_set_mdio_slow_mode_hv(hw);
+	if (ret_val)
+		return ret_val;
 
 	ret_val = hw->phy.ops.acquire(hw);
 	if (ret_val)