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 | |
| parent | e714d99cacac976deac3239c89f2c9e3125649b6 (diff) | |
| parent | 8d3d35b4e20dc2e678fc7cb51165905b5a32fb76 (diff) | |
Merge branch 'upstream-fixes' into upstream
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 2 | ||||
| -rw-r--r-- | drivers/net/sky2.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 06440a86bae..9bdd43ab357 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -2425,7 +2425,7 @@ static int myri10ge_resume(struct pci_dev *pdev) } myri10ge_reset(mgp); - myri10ge_dummy_rdma(mgp, mgp->tx.boundary != 4096); + myri10ge_dummy_rdma(mgp, 1); /* Save configuration space to be restored if the * nic resets due to a parity error */ diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 13431f6a3ad..805a7dcf550 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: |