Messages in this thread | | | Date | Thu, 06 Feb 2014 14:39:30 -0600 | From | Larry Finger <> | Subject | Re: [PATCH 2/2] rtlwifi: Fix incorrect return from rtl_ps_enable_nic() |
| |
On 02/01/2014 12:11 AM, Olivier Langlois wrote: > 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.net>
Larry
> --- > 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 */ >
| |