diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-10 08:31:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-10 08:31:03 -0400 |
| commit | f5c7db1c915ddad32deda2afcdf7ecf1d84fc8fd (patch) | |
| tree | c62f64f0c7e446cd11a2092fd101e75a1cfa38a2 /drivers/net/sky2.c | |
| parent | e714d99cacac976deac3239c89f2c9e3125649b6 (diff) | |
| parent | 8d3d35b4e20dc2e678fc7cb51165905b5a32fb76 (diff) | |
| download | kernel_samsung_smdk4412-f5c7db1c915ddad32deda2afcdf7ecf1d84fc8fd.zip kernel_samsung_smdk4412-f5c7db1c915ddad32deda2afcdf7ecf1d84fc8fd.tar.gz kernel_samsung_smdk4412-f5c7db1c915ddad32deda2afcdf7ecf1d84fc8fd.tar.bz2 | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 13431f6..805a7dc 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -238,6 +238,8 @@ static void sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) if (hw->ports > 1) reg1 |= PCI_Y2_PHY2_COMA; } + sky2_pci_write32(hw, PCI_DEV_REG1, reg1); + udelay(100); if (hw->chip_id == CHIP_ID_YUKON_EC_U) { sky2_pci_write32(hw, PCI_DEV_REG3, 0); @@ -247,9 +249,6 @@ static void sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) sky2_pci_write32(hw, PCI_DEV_REG5, 0); } - sky2_pci_write32(hw, PCI_DEV_REG1, reg1); - udelay(100); - break; case PCI_D3hot: |