The variable "fw_version" is used in the _ResetDigitalProcedure1().
but It is not initialized. so I add init codes for "fw_version" and
"fw_subversion".
Signed-off-by: Taehee Yoo <[email protected]>
---
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 29983bc..14b819e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -233,13 +233,14 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
pfwdata = (u8 *)rtlhal->pfirmware;
fwsize = rtlhal->fwsize;
-
if (IS_FW_HEADER_EXIST(pfwheader)) {
RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
"Firmware Version(%d), Signature(%#x),Size(%d)\n",
pfwheader->version, pfwheader->signature,
(int)sizeof(struct rtl92c_firmware_header));
+ rtlhal->fw_version = pfwheader->version;
+ rtlhal->fw_subversion = pfwheader->subversion;
pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
}
--
2.1.4
> The variable "fw_version" is used in the _ResetDigitalProcedure1().
> but It is not initialized. so I add init codes for "fw_version" and
> "fw_subversion".
>
> Signed-off-by: Taehee Yoo <[email protected]>
> Acked-by: Larry Finger <[email protected]>
Thanks, applied to wireless-drivers-next.git.
Kalle Valo
On 06/15/2015 07:35 AM, Kalle Valo wrote:
> Kalle Valo <[email protected]> writes:
>
>>> The variable "fw_version" is used in the _ResetDigitalProcedure1().
>>> but It is not initialized. so I add init codes for "fw_version" and
>>> "fw_subversion".
>>>
>>> Signed-off-by: Taehee Yoo <[email protected]>
>>> Acked-by: Larry Finger <[email protected]>
>>
>> Thanks, applied to wireless-drivers-next.git.
>
> This patch adds a new sparse warning. Please send a new patch to fix
> this.
>
>>> drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:242:36: sparse: incorrect type in assignment (different base types)
> drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:242:36: expected unsigned short [unsigned] [usertype] fw_version
> drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:242:36: got restricted __le16 [usertype] version
Sorry, I missed that when I reviewed the patch.
Larry
Kalle Valo <[email protected]> writes:
>> The variable "fw_version" is used in the _ResetDigitalProcedure1().
>> but It is not initialized. so I add init codes for "fw_version" and
>> "fw_subversion".
>>
>> Signed-off-by: Taehee Yoo <[email protected]>
>> Acked-by: Larry Finger <[email protected]>
>
> Thanks, applied to wireless-drivers-next.git.
This patch adds a new sparse warning. Please send a new patch to fix
this.
>> drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:242:36: sparse: incorrect type in assignment (different base types)
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:242:36: expected unsigned short [unsigned] [usertype] fw_version
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c:242:36: got restricted __le16 [usertype] version
--
Kalle Valo
2015-06-08 0:05 GMT+09:00 Larry Finger <[email protected]>:
> On 06/07/2015 08:33 AM, Taehee Yoo wrote:
>>
>> The variable "fw_version" is used in the _ResetDigitalProcedure1().
>> but It is not initialized. so I add init codes for "fw_version" and
>> "fw_subversion".
>>
>> Signed-off-by: Taehee Yoo <[email protected]>
>> ---
>
>
> V2 - Moved new statements into location where header is known to exist.
>
> You should have something like this after the separator (---) in the commit
> message for any resubmission.
>
> Acked-by: Larry Finger <[email protected]>
>
> Larry
>
>
>> drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
>> b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
>> index 29983bc..14b819e 100644
>> --- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
>> +++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
>> @@ -233,13 +233,14 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
>> pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
>> pfwdata = (u8 *)rtlhal->pfirmware;
>> fwsize = rtlhal->fwsize;
>> -
>> if (IS_FW_HEADER_EXIST(pfwheader)) {
>> RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
>> "Firmware Version(%d),
>> Signature(%#x),Size(%d)\n",
>> pfwheader->version, pfwheader->signature,
>> (int)sizeof(struct rtl92c_firmware_header));
>>
>> + rtlhal->fw_version = pfwheader->version;
>> + rtlhal->fw_subversion = pfwheader->subversion;
>> pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
>> fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
>> }
>>
>
Thank you for your feedback!
Would i resend it?
On 06/07/2015 10:18 AM, Taehee Yoo wrote:
> 2015-06-08 0:05 GMT+09:00 Larry Finger <[email protected]>:
>> On 06/07/2015 08:33 AM, Taehee Yoo wrote:
>>>
>>> The variable "fw_version" is used in the _ResetDigitalProcedure1().
>>> but It is not initialized. so I add init codes for "fw_version" and
>>> "fw_subversion".
>>>
>>> Signed-off-by: Taehee Yoo <[email protected]>
>>> ---
>>
>>
>> V2 - Moved new statements into location where header is known to exist.
>>
>> You should have something like this after the separator (---) in the commit
>> message for any resubmission.
>>
>> Acked-by: Larry Finger <[email protected]>
>>
>> Larry
>>
>>
>>> drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
>>> b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
>>> index 29983bc..14b819e 100644
>>> --- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
>>> +++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
>>> @@ -233,13 +233,14 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
>>> pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
>>> pfwdata = (u8 *)rtlhal->pfirmware;
>>> fwsize = rtlhal->fwsize;
>>> -
>>> if (IS_FW_HEADER_EXIST(pfwheader)) {
>>> RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
>>> "Firmware Version(%d),
>>> Signature(%#x),Size(%d)\n",
>>> pfwheader->version, pfwheader->signature,
>>> (int)sizeof(struct rtl92c_firmware_header));
>>>
>>> + rtlhal->fw_version = pfwheader->version;
>>> + rtlhal->fw_subversion = pfwheader->subversion;
>>> pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
>>> fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
>>> }
>>>
>>
>
> Thank you for your feedback!
> Would i resend it?
No, but remember that for next time.
Larry
On 06/07/2015 08:33 AM, Taehee Yoo wrote:
> The variable "fw_version" is used in the _ResetDigitalProcedure1().
> but It is not initialized. so I add init codes for "fw_version" and
> "fw_subversion".
>
> Signed-off-by: Taehee Yoo <[email protected]>
> ---
V2 - Moved new statements into location where header is known to exist.
You should have something like this after the separator (---) in the commit
message for any resubmission.
Acked-by: Larry Finger <[email protected]>
Larry
> drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> index 29983bc..14b819e 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
> @@ -233,13 +233,14 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
> pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
> pfwdata = (u8 *)rtlhal->pfirmware;
> fwsize = rtlhal->fwsize;
> -
> if (IS_FW_HEADER_EXIST(pfwheader)) {
> RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
> "Firmware Version(%d), Signature(%#x),Size(%d)\n",
> pfwheader->version, pfwheader->signature,
> (int)sizeof(struct rtl92c_firmware_header));
>
> + rtlhal->fw_version = pfwheader->version;
> + rtlhal->fw_subversion = pfwheader->subversion;
> pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
> fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
> }
>