diff options
| author | David S. Miller | 2011-12-16 08:11:14 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-12-16 08:11:14 +0100 |
| commit | b26e478f8fd5b575684f021b05a5c6236ebb911a (patch) | |
| tree | 27d3b3eaf3fe10d05319ad3395b2569ad5f8f6d0 /drivers/net/wireless/rtlwifi/rtl8192se/phy.c | |
| parent | tg3: Break out RSS indir table init and assignment (diff) | |
| parent | ipv6: Check dest prefix length on original route not copied one in rt6_alloc_... (diff) | |
| download | kernel-qcow2-linux-b26e478f8fd5b575684f021b05a5c6236ebb911a.tar.gz kernel-qcow2-linux-b26e478f8fd5b575684f021b05a5c6236ebb911a.tar.xz kernel-qcow2-linux-b26e478f8fd5b575684f021b05a5c6236ebb911a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/freescale/fsl_pq_mdio.c
net/batman-adv/translation-table.c
net/ipv6/route.c
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192se/phy.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c index f27171af979c..f10ac1ad9087 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c @@ -602,7 +602,7 @@ bool rtl92s_phy_set_rf_power_state(struct ieee80211_hw *hw, } case ERFSLEEP: if (ppsc->rfpwr_state == ERFOFF) - break; + return false; for (queue_id = 0, i = 0; queue_id < RTL_PCI_MAX_TX_QUEUE_COUNT;) { |