Re: [PATCH 4.4 112/117] rtlwifi: rtl8821ae: Fix errors in parameter initialization

Ben Hutchings
2016-02-16T18:46:29Z

[-- Attachment #1: Type: text/plain, Size: 1905 bytes --]

On Sun, 2016-02-14 at 14:22 -0800, Greg Kroah-Hartman wrote:

> 4.4-stable review patch.  If anyone has any objections, please let me know.
>
> ------------------
>
> From: Larry Finger <Larry.Finger@lwfinger.net>
>
> commit 78bae1de422a7f6f2b4b61f6a5c379e3d7f96f44 upstream.
>
> This driver failed to copy parameters sw_crypto and disable_watchdog into
> the locations actually used by the driver. In addition, msi_support was
> initialized three times and one of them used the wrong variable. The
> initialization of parameter int_clear was moved so that it is near that
> of the rest of the parameters.
>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
>  drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c |    9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
[...]
> @@ -168,12 +166,15 @@ int rtl8821ae_init_sw_vars(struct ieee80
>   rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
>   rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
>   rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support;
> - rtlpci->msi_support = rtlpriv->cfg->mod_params->int_clear;
> + rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear;
> + rtlpriv->cfg->mod_params->sw_crypto =
> + rtlpriv->cfg->mod_params->sw_crypto;
> + rtlpriv->cfg->mod_params->disable_watchdog =
> + rtlpriv->cfg->mod_params->disable_watchdog;
[...]

This is self-assignment.  How is that going to help?

Ben.

--
Ben Hutchings
Life is what happens to you while you're busy making other plans.
- John Lennon

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]