diff options
-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 06440a86baef..9bdd43ab3573 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) | |||
2425 | } | 2425 | } |
2426 | 2426 | ||
2427 | myri10ge_reset(mgp); | 2427 | myri10ge_reset(mgp); |
2428 | myri10ge_dummy_rdma(mgp, mgp->tx.boundary != 4096); | 2428 | myri10ge_dummy_rdma(mgp, 1); |
2429 | 2429 | ||
2430 | /* Save configuration space to be restored if the | 2430 | /* Save configuration space to be restored if the |
2431 | * nic resets due to a parity error */ | 2431 | * nic resets due to a parity error */ |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 13431f6a3ad9..805a7dcf5508 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) | |||
238 | if (hw->ports > 1) | 238 | if (hw->ports > 1) |
239 | reg1 |= PCI_Y2_PHY2_COMA; | 239 | reg1 |= PCI_Y2_PHY2_COMA; |
240 | } | 240 | } |
241 | sky2_pci_write32(hw, PCI_DEV_REG1, reg1); | ||
242 | udelay(100); | ||
241 | 243 | ||
242 | if (hw->chip_id == CHIP_ID_YUKON_EC_U) { | 244 | if (hw->chip_id == CHIP_ID_YUKON_EC_U) { |
243 | sky2_pci_write32(hw, PCI_DEV_REG3, 0); | 245 | 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) | |||
247 | sky2_pci_write32(hw, PCI_DEV_REG5, 0); | 249 | sky2_pci_write32(hw, PCI_DEV_REG5, 0); |
248 | } | 250 | } |
249 | 251 | ||
250 | sky2_pci_write32(hw, PCI_DEV_REG1, reg1); | ||
251 | udelay(100); | ||
252 | |||
253 | break; | 252 | break; |
254 | 253 | ||
255 | case PCI_D3hot: | 254 | case PCI_D3hot: |