From 8b6a0a9bb44a2dd418856485c1a6b77e75fb09f0 Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 5 Dec 2012 06:26:19 +0000
Subject: [PATCH] --- yaml --- r: 351407 b: refs/heads/master c:
 8e5ab42d7fdd73b11a6b6b58b4a7b26931c73385 h: refs/heads/master i:   351405:
 b280aba0000ea9cb119b4b9367a4c6b0813e72e2   351403:
 70abbca691fcf31d0f3a09cdde2ab17935f23151   351399:
 481277bcaca5a99fa2d365ed553a28e46b83de3b   351391:
 cdc021acde2da2649360fceb6459bcb03df7c9ec v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0875bb9720e6..e5536421b237 100644
--- 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
index 15d93141cc11..051dfda75fc0 100644
--- 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)