diff options
| author | Pavel Roskin <proski@gnu.org> | 2011-06-29 15:39:43 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-05 14:41:14 -0400 |
| commit | 37000b305bff81bb1ee2f7f37b1319b670a08f76 (patch) | |
| tree | f025100e8407ca5e70bee32cd914e14bc2c3b86d | |
| parent | 95acbd432b4c6498c5b4b2f92e0e05e3c032d4f8 (diff) | |
| download | kernel_samsung_smdk4412-37000b305bff81bb1ee2f7f37b1319b670a08f76.zip kernel_samsung_smdk4412-37000b305bff81bb1ee2f7f37b1319b670a08f76.tar.gz kernel_samsung_smdk4412-37000b305bff81bb1ee2f7f37b1319b670a08f76.tar.bz2 | |
ath5k: fix incorrect use of drvdata in PCI suspend/resume code
Signed-off-by: Pavel Roskin <proski@gnu.org>
Cc: <stable@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/pci.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c index 296c316..f2c0c23 100644 --- a/drivers/net/wireless/ath/ath5k/pci.c +++ b/drivers/net/wireless/ath/ath5k/pci.c @@ -297,7 +297,9 @@ ath5k_pci_remove(struct pci_dev *pdev) #ifdef CONFIG_PM_SLEEP static int ath5k_pci_suspend(struct device *dev) { - struct ath5k_softc *sc = pci_get_drvdata(to_pci_dev(dev)); + struct pci_dev *pdev = to_pci_dev(dev); + struct ieee80211_hw *hw = pci_get_drvdata(pdev); + struct ath5k_softc *sc = hw->priv; ath5k_led_off(sc); return 0; @@ -306,7 +308,8 @@ static int ath5k_pci_suspend(struct device *dev) static int ath5k_pci_resume(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); - struct ath5k_softc *sc = pci_get_drvdata(pdev); + struct ieee80211_hw *hw = pci_get_drvdata(pdev); + struct ath5k_softc *sc = hw->priv; /* * Suspend/Resume resets the PCI configuration space, so we have to |