e1000e: potential incorrect return for e1000_setup_copper_link_80003es2lan
authorBruce Allan <bruce.w.allan@intel.com>
Wed, 8 Feb 2012 02:54:58 +0000 (02:54 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 13 Feb 2012 20:28:37 +0000 (12:28 -0800)
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().

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>
drivers/net/ethernet/intel/e1000e/80003es2lan.c

index 37e78649c7107323820935d55c067b36160768a1..99eb09007e73db2b7d8b7466a2189920a39abe96 100644 (file)
@@ -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);
 }
 
 /**