From: Larry Finger <Larry.Finger@lwfinger.net>
To: Olivier Langlois <olivier@trillion01.com>,
linville@tuxdriver.com, chaoming_li@realsil.com.cn
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Stable <stable@vger.kernel.org>
Subject: Re: [PATCH 2/2] rtlwifi: Fix incorrect return from rtl_ps_enable_nic()
Date: Thu, 06 Feb 2014 14:39:30 -0600 [thread overview]
Message-ID: <52F3F302.1040703@lwfinger.net> (raw)
In-Reply-To: <1391235070-23180-2-git-send-email-olivier@trillion01.com>
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 */
>
next prev parent reply other threads:[~2014-02-06 20:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-01 6:11 [PATCH 1/2] rtlwifi: rtl8192ce: Fix too long disable of IRQs Olivier Langlois
2014-02-01 6:11 ` [PATCH 2/2] rtlwifi: Fix incorrect return from rtl_ps_enable_nic() Olivier Langlois
2014-02-06 20:39 ` Larry Finger [this message]
2014-02-06 20:38 ` [PATCH 1/2] rtlwifi: rtl8192ce: Fix too long disable of IRQs Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52F3F302.1040703@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=chaoming_li@realsil.com.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=olivier@trillion01.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).