ath9k: fix ASPM initialization on resume
authorFelix Fietkau <nbd@openwrt.org>
Wed, 3 Oct 2012 19:07:50 +0000 (21:07 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 5 Oct 2012 20:26:17 +0000 (16:26 -0400)
ath_pci_aspm_init is only called on card init, so PCI registers get reset
after a suspend/resume cycle.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/pci.c

index 0e630a99b68b8fa729af6007de32e97d16c7f6ff..270abf720f3ef399900b2750189d363daa45cbe0 100644 (file)
@@ -324,6 +324,9 @@ static int ath_pci_suspend(struct device *device)
 static int ath_pci_resume(struct device *device)
 {
        struct pci_dev *pdev = to_pci_dev(device);
+       struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+       struct ath_softc *sc = hw->priv;
+       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
        u32 val;
 
        /*
@@ -335,6 +338,8 @@ static int ath_pci_resume(struct device *device)
        if ((val & 0x0000ff00) != 0)
                pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 
+       ath_pci_aspm_init(common);
+
        return 0;
 }