Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 290118
b: refs/heads/master
c: d7eb338
h: refs/heads/master
v: v3
  • Loading branch information
Bruce Allan authored and Jeff Kirsher committed Feb 13, 2012
1 parent 0891a9e commit 937156a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 826072555b0dceac44a6e69a0c5be137e829c9d4
refs/heads/master: d7eb33840bee3c8de3f64f3861350bcfac3eaf82
4 changes: 2 additions & 2 deletions trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

/**
Expand Down

0 comments on commit 937156a

Please sign in to comment.