diff options
| author | Sujith <Sujith.Manoharan@atheros.com> | 2009-08-13 09:34:35 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:14:09 -0400 |
| commit | 523c36fc9cf75ccf605d9acf68ae9eb857de3f58 (patch) | |
| tree | cb62b36b46364acc328808d068b6d435c6192e02 /drivers/net/wireless/ath/ath9k/pci.c | |
| parent | 1cf6873a191388ff7d06bbd70f68bbffe1d70019 (diff) | |
| download | kernel_samsung_smdk4412-523c36fc9cf75ccf605d9acf68ae9eb857de3f58.zip kernel_samsung_smdk4412-523c36fc9cf75ccf605d9acf68ae9eb857de3f58.tar.gz kernel_samsung_smdk4412-523c36fc9cf75ccf605d9acf68ae9eb857de3f58.tar.bz2 | |
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/ath9k/pci.c')
| -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 3546504..616bdff 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 |