[netdrvr] forcedeth: reorder suspend/resume code
authorTobias Diedrich <ranma+kernel@tdiedrich.de>
Sun, 18 May 2008 13:04:29 +0000 (15:04 +0200)
committerJeff Garzik <jgarzik@redhat.com>
Sat, 31 May 2008 02:19:11 +0000 (22:19 -0400)
Match the suspend/resume code ordering in e100/e1000e more closely.
For example the configuration space should be saved on suspend even for
devices that are not up.

Signed-off-by: Tobias Diedrich <ranma+kernel@tdiedrich.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/forcedeth.c

index a5650ed4d481e742896fc61f001c8c865b01a799..e4d697894364cc247ec4413a627c9c66668d16eb 100644 (file)
@@ -5792,22 +5792,20 @@ static int nv_suspend(struct pci_dev *pdev, pm_message_t state)
        u8 __iomem *base = get_hwbase(dev);
        int i;
 
-       if (!netif_running(dev))
-               goto out;
-
+       if (netif_running(dev)) {
+               // Gross.
+               nv_close(dev);
+       }
        netif_device_detach(dev);
 
-       // Gross.
-       nv_close(dev);
-
        /* save non-pci configuration space */
        for (i = 0;i <= np->register_size/sizeof(u32); i++)
                np->saved_config_space[i] = readl(base + i*sizeof(u32));
 
        pci_save_state(pdev);
        pci_enable_wake(pdev, pci_choose_state(pdev, state), np->wolenabled);
+       pci_disable_device(pdev);
        pci_set_power_state(pdev, pci_choose_state(pdev, state));
-out:
        return 0;
 }
 
@@ -5818,22 +5816,20 @@ static int nv_resume(struct pci_dev *pdev)
        u8 __iomem *base = get_hwbase(dev);
        int i, rc = 0;
 
-       if (!netif_running(dev))
-               goto out;
-
-       netif_device_attach(dev);
-
        pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
+       /* ack any pending wake events, disable PME */
        pci_enable_wake(pdev, PCI_D0, 0);
 
        /* restore non-pci configuration space */
        for (i = 0;i <= np->register_size/sizeof(u32); i++)
                writel(np->saved_config_space[i], base+i*sizeof(u32));
 
-       rc = nv_open(dev);
-       nv_set_multicast(dev);
-out:
+       netif_device_attach(dev);
+       if (netif_running(dev)) {
+               rc = nv_open(dev);
+               nv_set_multicast(dev);
+       }
        return rc;
 }