| From 2e8c5e56b307271c2dab6f8bfd1d8a3822ca2390 Mon Sep 17 00:00:00 2001 |
| From: Olivier Langlois <olivier@trillion01.com> |
| Date: Sat, 1 Feb 2014 01:11:10 -0500 |
| Subject: rtlwifi: Fix incorrect return from rtl_ps_enable_nic() |
| |
| From: Olivier Langlois <olivier@trillion01.com> |
| |
| commit 2e8c5e56b307271c2dab6f8bfd1d8a3822ca2390 upstream. |
| |
| 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> |
| Acked-by: Larry Finger <Larry.Finger@lwfinger.net> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/rtlwifi/ps.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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_ |
| |
| /*<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 */ |
