diff options
author | Kalle Valo <kvalo@codeaurora.org> | 2019-10-03 16:39:51 +0300 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2019-10-03 16:39:51 +0300 |
commit | 97ef12263fce2835dfbc01d1d86b8c5fd711712f (patch) | |
tree | 6226c3e297442c6f168f10a18a163e620c70cda0 /drivers/net/wireless/ath/ath5k/pci.c | |
parent | 4a50d454502f1401171ff061a5424583f91266db (diff) | |
parent | 2c840676be8ffc624bf9bb4490d944fd13c02d71 (diff) | |
download | linux-97ef12263fce2835dfbc01d1d86b8c5fd711712f.tar.gz linux-97ef12263fce2835dfbc01d1d86b8c5fd711712f.tar.bz2 linux-97ef12263fce2835dfbc01d1d86b8c5fd711712f.zip |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 5.5. Major changes:
ath10k
* add support for hardware rfkill on devices where firmware supports it
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/pci.c')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c index d5ee32ce9eb3..43b4ae86e5fb 100644 --- a/drivers/net/wireless/ath/ath5k/pci.c +++ b/drivers/net/wireless/ath/ath5k/pci.c @@ -300,8 +300,7 @@ ath5k_pci_remove(struct pci_dev *pdev) #ifdef CONFIG_PM_SLEEP static int ath5k_pci_suspend(struct device *dev) { - struct pci_dev *pdev = to_pci_dev(dev); - struct ieee80211_hw *hw = pci_get_drvdata(pdev); + struct ieee80211_hw *hw = dev_get_drvdata(dev); struct ath5k_hw *ah = hw->priv; ath5k_led_off(ah); |