aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2009-02-20 15:13:26 +0530
committerJohn W. Linville <linville@tuxdriver.com>2009-02-27 14:52:49 -0500
commitdb0f41f556620ed73e8beaafb820baf53f863df9 (patch)
tree5df00eff235a1e88e63556e1f2cd021d52a4fc3d
parent8147f5de7a7f241a729aaec912df7dd87a473cd0 (diff)
ath9k: Fix PCI shutdown sequence
pci_release_region() has to be called after the device has been disabled. Also remove a stray __init attribute. Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath9k/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/pci.c b/drivers/net/wireless/ath9k/pci.c
index a70f954c9e7..eea9d3a9d43 100644
--- a/drivers/net/wireless/ath9k/pci.c
+++ b/drivers/net/wireless/ath9k/pci.c
@@ -52,8 +52,8 @@ static void ath_pci_cleanup(struct ath_softc *sc)
struct pci_dev *pdev = to_pci_dev(sc->dev);
pci_iounmap(pdev, sc->mem);
- pci_release_region(pdev, 0);
pci_disable_device(pdev);
+ pci_release_region(pdev, 0);
}
static bool ath_pci_eeprom_read(struct ath_hw *ah, u32 off, u16 *data)
@@ -293,7 +293,7 @@ static struct pci_driver ath_pci_driver = {
#endif /* CONFIG_PM */
};
-int __init ath_pci_init(void)
+int ath_pci_init(void)
{
return pci_register_driver(&ath_pci_driver);
}