From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751375AbaBAGLV (ORCPT ); Sat, 1 Feb 2014 01:11:21 -0500 Received: from qproxy1-pub.mail.unifiedlayer.com ([173.254.64.10]:54858 "HELO qproxy1.mail.unifiedlayer.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1751034AbaBAGLT (ORCPT ); Sat, 1 Feb 2014 01:11:19 -0500 From: Olivier Langlois To: Larry.Finger@lwfinger.net, linville@tuxdriver.com, chaoming_li@realsil.com.cn Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Olivier Langlois , Stable Subject: [PATCH 2/2] rtlwifi: Fix incorrect return from rtl_ps_enable_nic() Date: Sat, 1 Feb 2014 01:11:10 -0500 Message-Id: <1391235070-23180-2-git-send-email-olivier@trillion01.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1391235070-23180-1-git-send-email-olivier@trillion01.com> References: <1391235070-23180-1-git-send-email-olivier@trillion01.com> X-Identified-User: {5686:box610.bluehost.com:olivierl:trillion01.com} {sentby:smtp auth 173.179.63.169 authed with olivier@trillion01.com} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Stable --- drivers/net/wireless/rtlwifi/ps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index 0d81f76..a56e9b3 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 */ -- 1.8.5.2