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

e1000e: potential incorrect return for e1000_setup_copper_link_80003es2lan

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

(cherry picked from commit 8649f4319656f9fcaa59726799a824254b0a1bce)
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 9ef094175801..f13ce84af410 100644
--- a/drivers/net/e1000e/80003es2lan.c
+++ b/drivers/net/e1000e/80003es2lan.c
@@ -1147,9 +1147,7 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw)
 	if (ret_val)
 		return ret_val;
 
-	ret_val = e1000e_setup_copper_link(hw);
-
-	return 0;
+	return e1000e_setup_copper_link(hw);
 }
 
 /**