aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-13 17:58:41 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-17 09:54:08 -0500
commit7d5869e78f4c9d32f834dadefbb7dcb3c9d4d85f (patch)
tree136560d132409e801be0c0e0ba00da7ea9695d05 /drivers/net
parent685a4ef0df23b97eea1842c2698da9a2e35fc976 (diff)
bcma: connect the bcma bus suspend/resume to the bcma driver suspend/resume
Now the low-level driver actually gets informed that it is getting suspended and resumed. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index d106576ce338..213130afdaf7 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1135,7 +1135,7 @@ static int brcms_pci_suspend(struct pci_dev *pdev)
1135 return pci_set_power_state(pdev, PCI_D3hot); 1135 return pci_set_power_state(pdev, PCI_D3hot);
1136} 1136}
1137 1137
1138static int brcms_suspend(struct bcma_device *pdev, pm_message_t state) 1138static int brcms_suspend(struct bcma_device *pdev)
1139{ 1139{
1140 struct brcms_info *wl; 1140 struct brcms_info *wl;
1141 struct ieee80211_hw *hw; 1141 struct ieee80211_hw *hw;