Commit d7eb3384 authored Feb 08, 2012 by Bruce Allan Committed by Jeff Kirsher Feb 13, 2012

e1000e: potentially incorrect return for e1000_set_d3_lplu_state_ich8lan



In the unlikely event that e1e_wphy() returns an error, the returned error
code is not propogated to the caller of e1000_set_d3_lplu_state_ich8lan().
With this change, there is a rare possibility that ret_val might not get
set so it must be initialized.

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>

parent 82607255

drivers/net/ethernet/intel/e1000e/ich8lan.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2030,7 +2030,7 @@ static s32 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
		{
		struct e1000_phy_info *phy = &hw->phy;
		u32 phy_ctrl;
		s32 ret_val;
		s32 ret_val = 0;
		u16 data;

		phy_ctrl = er32(PHY_CTRL);
		@@ -2096,7 +2096,7 @@ static s32 e1000_set_d3_lplu_state_ich8lan(struct e1000_hw *hw, bool active)
		ret_val = e1e_wphy(hw, IGP01E1000_PHY_PORT_CONFIG, data);
		}

		return 0;
		return ret_val;
		}

		/**