Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 254889
b: refs/heads/master
c: 37000b3
h: refs/heads/master
i:
  254887: 0082a79
v: v3
  • Loading branch information
Pavel Roskin authored and John W. Linville committed Jul 5, 2011
1 parent 2fdf903 commit 7cc1f10
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 95acbd432b4c6498c5b4b2f92e0e05e3c032d4f8
refs/heads/master: 37000b305bff81bb1ee2f7f37b1319b670a08f76
7 changes: 5 additions & 2 deletions trunk/drivers/net/wireless/ath/ath5k/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down

0 comments on commit 7cc1f10

Please sign in to comment.