]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ath9k: Fix bug in PCI resume
authorSujith <Sujith.Manoharan@atheros.com>
Thu, 13 Aug 2009 04:04:35 +0000 (09:34 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Aug 2009 13:14:09 +0000 (09:14 -0400)
This patch fixes a bug where the device was enabled
before restoring the PCI state.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/pci.c

index 3546504a83c42cc108b8abd2039454fa09d21f2d..616bdff2b6a159958fec96a42dac542dd7240ff3 100644 (file)
@@ -253,10 +253,12 @@ static int ath_pci_resume(struct pci_dev *pdev)
        u32 val;
        int err;
 
+       pci_restore_state(pdev);
+
        err = pci_enable_device(pdev);
        if (err)
                return err;
-       pci_restore_state(pdev);
+
        /*
         * Suspend/Resume resets the PCI configuration space, so we have to
         * re-disable the RETRY_TIMEOUT register (0x41) to keep