From: Daniel Ritz <daniel.ritz@gmx.ch>
During a warm boot the device is in D3 and has troubles coming out of it.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/net/3c59x.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff -puN drivers/net/3c59x.c~3c59x-only-put-the-device-into-d3-when-were-actually-using-wol drivers/net/3c59x.c
--- 25/drivers/net/3c59x.c~3c59x-only-put-the-device-into-d3-when-were-actually-using-wol 2005-04-25 21:47:14.112383720 -0700
+++ 25-akpm/drivers/net/3c59x.c 2005-04-25 21:47:14.117382960 -0700
@@ -1581,7 +1581,8 @@ vortex_up(struct net_device *dev)
if (VORTEX_PCI(vp)) {
pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */
- pci_restore_state(VORTEX_PCI(vp));
+ if (vp->pm_state_valid)
+ pci_restore_state(VORTEX_PCI(vp));
pci_enable_device(VORTEX_PCI(vp));
}
@@ -2741,6 +2742,7 @@ vortex_down(struct net_device *dev, int
outl(0, ioaddr + DownListPtr);
if (final_down && VORTEX_PCI(vp)) {
+ vp->pm_state_valid = 1;
pci_save_state(VORTEX_PCI(vp));
acpi_set_WOL(dev);
}
@@ -3243,9 +3245,10 @@ static void acpi_set_WOL(struct net_devi
outw(RxEnable, ioaddr + EL3_CMD);
pci_enable_wake(VORTEX_PCI(vp), 0, 1);
+
+ /* Change the power state to D3; RxEnable doesn't take effect. */
+ pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);
}
- /* Change the power state to D3; RxEnable doesn't take effect. */
- pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);
}
_