diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-14 23:35:41 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-14 23:35:41 +0400 |
| commit | 5d22df200beccb1dea26fe4d8684ed93ae2f0aeb (patch) | |
| tree | 05220b08a0c9d170ad88e3b9ed0390750d22d8ea /drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | |
| parent | 8b1fdb53075bd794a209a611bc94aedaf7ecf9e2 (diff) | |
| parent | 78feb35b8161acd95c33a703ed6ab6f554d29387 (diff) | |
| download | linux-5d22df200beccb1dea26fe4d8684ed93ae2f0aeb.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192cu/phy.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c index 72852900df84..e49cf2244c75 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c @@ -548,7 +548,7 @@ static bool _rtl92cu_phy_set_rf_power_state(struct ieee80211_hw *hw, break; case ERFSLEEP: if (ppsc->rfpwr_state == ERFOFF) - break; + return false; for (queue_id = 0, i = 0; queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) { ring = &pcipriv->dev.tx_ring[queue_id]; |