diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:48 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:48 -0500 |
| commit | dba9532388b00d591d87c638a47dcc7ba3763fc5 (patch) | |
| tree | cc9de8cbc40d0e927b1924d1d943208e84e21d1f /drivers/net/igb/e1000_phy.c | |
| parent | 78b8d5d2ee280c463908fd75f3bdf246bcb6ac8d (diff) | |
| parent | c68db7175f4dcb3d5789bb50bea6376fb81f87fe (diff) | |
Merge remote branch 'alsa/fixes' into fix/misc
Diffstat (limited to 'drivers/net/igb/e1000_phy.c')
| -rw-r--r-- | drivers/net/igb/e1000_phy.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c index 5c9d73e9bb8..3670a66401b 100644 --- a/drivers/net/igb/e1000_phy.c +++ b/drivers/net/igb/e1000_phy.c | |||
| @@ -457,15 +457,6 @@ s32 igb_copper_link_setup_82580(struct e1000_hw *hw) | |||
| 457 | phy_data |= I82580_CFG_ENABLE_DOWNSHIFT; | 457 | phy_data |= I82580_CFG_ENABLE_DOWNSHIFT; |
| 458 | 458 | ||
| 459 | ret_val = phy->ops.write_reg(hw, I82580_CFG_REG, phy_data); | 459 | ret_val = phy->ops.write_reg(hw, I82580_CFG_REG, phy_data); |
| 460 | if (ret_val) | ||
| 461 | goto out; | ||
| 462 | |||
| 463 | /* Set number of link attempts before downshift */ | ||
| 464 | ret_val = phy->ops.read_reg(hw, I82580_CTRL_REG, &phy_data); | ||
| 465 | if (ret_val) | ||
| 466 | goto out; | ||
| 467 | phy_data &= ~I82580_CTRL_DOWNSHIFT_MASK; | ||
| 468 | ret_val = phy->ops.write_reg(hw, I82580_CTRL_REG, phy_data); | ||
| 469 | 460 | ||
| 470 | out: | 461 | out: |
| 471 | return ret_val; | 462 | return ret_val; |