summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorOlivier Langlois <olivier@trillion01.com>2014-02-01 07:11:10 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-02-13 20:58:12 +0100
commit2e8c5e56b307271c2dab6f8bfd1d8a3822ca2390 (patch)
tree6801cf800fcec5756735da21b002672bf6951ce7 /drivers/net
parentrtlwifi: rtl8192ce: Fix too long disable of IRQs (diff)
downloadlinux-2e8c5e56b307271c2dab6f8bfd1d8a3822ca2390.tar.xz
linux-2e8c5e56b307271c2dab6f8bfd1d8a3822ca2390.zip
rtlwifi: Fix incorrect return from rtl_ps_enable_nic()
rtl_ps_enable_nic() is called from loops that will loop until this function returns true or a maximum number of retries is performed. hw_init() returns non-zero on error. In that situation return false to restore the original design intent to retry hw init when it fails. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Cc: Stable <stable@vger.kernel.org> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/rtlwifi/ps.c2
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)
/*<2> Enable Adapter */
if (rtlpriv->cfg->ops->hw_init(hw))
- return 1;
+ return false;
RT_CLEAR_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC);
/*<3> Enable Interrupt */