From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 8 Feb 2012 02:54:53 +0000 (+0000)
Subject: e1000e: potentially incorrect return for e1000_cfg_kmrn_10_100_80003es2lan
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~326
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7a1f9c9d4e5755a73fc9db5c27e11606a47d86c;p=users%2Fjedix%2Flinux-maple.git

e1000e: potentially incorrect return for e1000_cfg_kmrn_10_100_80003es2lan

In the unlikely event that e1e_wphy() returns an error, the returned error
code value is not propogated to the caller of
e1000_cfg_kmrn_10_100_80003es2lan().

(cherry picked from commit 520d6f225f83128e9ea083a9a226f807235cc76c)
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/e1000e/80003es2lan.c b/drivers/net/e1000e/80003es2lan.c
index 460256988338..9ef094175801 100644
--- a/drivers/net/e1000e/80003es2lan.c
+++ b/drivers/net/e1000e/80003es2lan.c
@@ -1225,9 +1225,7 @@ static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
 	else
 		reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
 
-	ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
-
-	return 0;
+	return e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
 }
 
 /**