diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-08-13 06:04:35 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 15:14:09 +0200 |
commit | 523c36fc9cf75ccf605d9acf68ae9eb857de3f58 (patch) | |
tree | cb62b36b46364acc328808d068b6d435c6192e02 /drivers/net/wireless/ath | |
parent | ath9k: Remove duplicate variables (diff) | |
download | linux-523c36fc9cf75ccf605d9acf68ae9eb857de3f58.tar.xz linux-523c36fc9cf75ccf605d9acf68ae9eb857de3f58.zip |
ath9k: Fix bug in PCI resume
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>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 3546504a83c4..616bdff2b6a1 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c @@ -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 |