aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2009-02-20 04:43:26 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-02-27 14:52:49 -0500
commitdb0f41f556620ed73e8beaafb820baf53f863df9 (patch)
tree5df00eff235a1e88e63556e1f2cd021d52a4fc3d /drivers
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>
Diffstat (limited to 'drivers')
-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 a70f954c9e75..eea9d3a9d43c 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)
52 struct pci_dev *pdev = to_pci_dev(sc->dev); 52 struct pci_dev *pdev = to_pci_dev(sc->dev);
53 53
54 pci_iounmap(pdev, sc->mem); 54 pci_iounmap(pdev, sc->mem);
55 pci_release_region(pdev, 0);
56 pci_disable_device(pdev); 55 pci_disable_device(pdev);
56 pci_release_region(pdev, 0);
57} 57}
58 58
59static bool ath_pci_eeprom_read(struct ath_hw *ah, u32 off, u16 *data) 59static bool ath_pci_eeprom_read(struct ath_hw *ah, u32 off, u16 *data)
@@ -293,7 +293,7 @@ static struct pci_driver ath_pci_driver = {
293#endif /* CONFIG_PM */ 293#endif /* CONFIG_PM */
294}; 294};
295 295
296int __init ath_pci_init(void) 296int ath_pci_init(void)
297{ 297{
298 return pci_register_driver(&ath_pci_driver); 298 return pci_register_driver(&ath_pci_driver);
299} 299}