diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-04 23:45:14 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-04 23:45:14 +0400 |
| commit | 01925efdf7e03b4b803b5c9f985163d687f7f017 (patch) | |
| tree | 6c318f9bf002efac5ccd87e8edad35863d72bd17 /drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | |
| parent | a1b13b9ad3759dca24c6b721ee026c540a4e6564 (diff) | |
| parent | 8ce9beac4661f576ea0d518b9f086bb52a171a37 (diff) | |
| download | linux-01925efdf7e03b4b803b5c9f985163d687f7f017.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/pcie/drv.c
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index 3a6544710c8a..edc5d105ff98 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -457,6 +457,8 @@ static int brcms_ops_start(struct ieee80211_hw *hw) if (err != 0) brcms_err(wl->wlc->hw->d11core, "%s: brcms_up() returned %d\n", __func__, err); + + bcma_core_pci_power_save(wl->wlc->hw->d11core->bus, true); return err; } @@ -479,6 +481,8 @@ static void brcms_ops_stop(struct ieee80211_hw *hw) return; } + bcma_core_pci_power_save(wl->wlc->hw->d11core->bus, false); + /* put driver in down state */ spin_lock_bh(&wl->lock); brcms_down(wl); |