aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2009-08-13 00:04:35 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:14:09 -0400
commit523c36fc9cf75ccf605d9acf68ae9eb857de3f58 (patch)
treecb62b36b46364acc328808d068b6d435c6192e02 /drivers
parent1cf6873a191388ff7d06bbd70f68bbffe1d70019 (diff)
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')
-rw-r--r--drivers/net/wireless/ath/ath9k/pci.c4
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)
253 u32 val; 253 u32 val;
254 int err; 254 int err;
255 255
256 pci_restore_state(pdev);
257
256 err = pci_enable_device(pdev); 258 err = pci_enable_device(pdev);
257 if (err) 259 if (err)
258 return err; 260 return err;
259 pci_restore_state(pdev); 261
260 /* 262 /*
261 * Suspend/Resume resets the PCI configuration space, so we have to 263 * Suspend/Resume resets the PCI configuration space, so we have to
262 * re-disable the RETRY_TIMEOUT register (0x41) to keep 264 * re-disable the RETRY_TIMEOUT register (0x41) to keep