From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/net/e1000/e1000_main.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff -puN drivers/net/e1000/e1000_main.c~git-netdev-all-e1000-fixup drivers/net/e1000/e1000_main.c --- devel/drivers/net/e1000/e1000_main.c~git-netdev-all-e1000-fixup 2006-05-14 02:03:24.000000000 -0700 +++ devel-akpm/drivers/net/e1000/e1000_main.c 2006-05-14 02:03:53.000000000 -0700 @@ -4569,22 +4569,15 @@ e1000_resume(struct pci_dev *pdev) { struct net_device *netdev = pci_get_drvdata(pdev); struct e1000_adapter *adapter = netdev_priv(netdev); - int retval; uint32_t manc, ret_val; - retval = pci_set_power_state(pdev, PCI_D0); - if (retval) - DPRINTK(PROBE, ERR, "Error in setting power state\n"); + pci_set_power_state(pdev, PCI_D0); e1000_pci_restore_state(adapter); ret_val = pci_enable_device(pdev); pci_set_master(pdev); - retval = pci_enable_wake(pdev, PCI_D3hot, 0); - if (retval) - DPRINTK(PROBE, ERR, "Error enabling D3 wake\n"); - retval = pci_enable_wake(pdev, PCI_D3cold, 0); - if (retval) - DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n"); + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); e1000_reset(adapter); E1000_WRITE_REG(&adapter->hw, WUS, ~0); _