From 0891a9e7952f35ce3709fe8ebba4c853e2076ac8 Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 8 Feb 2012 02:55:09 +0000
Subject: [PATCH] --- yaml --- r: 290117 b: refs/heads/master c:
 826072555b0dceac44a6e69a0c5be137e829c9d4 h: refs/heads/master i:   290115:
 2db3e0d7a3ba3c96263f62feec2e277b1c31e5dd v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/82571.c   | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/mac.c     | 2 +-
 trunk/drivers/net/ethernet/intel/e1000e/phy.c     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 32f2b7d2bbad..801d167644f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7eb61d81946ccb61726600c6e8ceefcce9844f02
+refs/heads/master: 826072555b0dceac44a6e69a0c5be137e829c9d4
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/82571.c b/trunk/drivers/net/ethernet/intel/e1000e/82571.c
index 024ac243e23f..05e9a2911168 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/82571.c
@@ -796,7 +796,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
 	 * otherwise, commit the checksum to the flash NVM.
 	 */
 	if (hw->nvm.type != e1000_nvm_flash_hw)
-		return ret_val;
+		return 0;
 
 	/* Check for pending operations. */
 	for (i = 0; i < E1000_FLASH_UPDATES; i++) {
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 6ab7254487ad..ce348cd99d53 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1948,7 +1948,7 @@ static s32 e1000_set_d0_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
 	u16 data;
 
 	if (phy->type == e1000_phy_ife)
-		return ret_val;
+		return 0;
 
 	phy_ctrl = er32(PHY_CTRL);
 
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/mac.c b/trunk/drivers/net/ethernet/intel/e1000e/mac.c
index ce8a55a584be..b3b2f9e567ff 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/mac.c
@@ -444,7 +444,7 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
 		return ret_val;
 
 	if (!link)
-		return ret_val;	/* No link detected */
+		return 0;	/* No link detected */
 
 	mac->get_link_status = false;
 
diff --git a/trunk/drivers/net/ethernet/intel/e1000e/phy.c b/trunk/drivers/net/ethernet/intel/e1000e/phy.c
index 323cb145f849..a8b99bae0222 100644
--- a/trunk/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/trunk/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1916,7 +1916,7 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
 
 	phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
 
-	return ret_val;
+	return 0;
 }
 
 /**