diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-17 15:54:31 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-17 15:54:31 -0500 |
| commit | ff95fe382c658d81ebe01ba68dca2e00ca814ff0 (patch) | |
| tree | f57d3441403a2ff7e7581d15d81a5d9141094cd2 /drivers/net/wireless/rtlwifi/ps.c | |
| parent | eb85569fe2d06c2fbf4de7b66c263ca095b397aa (diff) | |
| parent | 4885c8731a34eecf509822e089ce17bcd9bd4650 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/ps.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index deedae3c5449..d1c0191a195b 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c | |||
| @@ -48,7 +48,7 @@ bool rtl_ps_enable_nic(struct ieee80211_hw *hw) | |||
| 48 | 48 | ||
| 49 | /*<2> Enable Adapter */ | 49 | /*<2> Enable Adapter */ |
| 50 | if (rtlpriv->cfg->ops->hw_init(hw)) | 50 | if (rtlpriv->cfg->ops->hw_init(hw)) |
| 51 | return 1; | 51 | return false; |
| 52 | RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC); | 52 | RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC); |
| 53 | 53 | ||
| 54 | /*<3> Enable Interrupt */ | 54 | /*<3> Enable Interrupt */ |