| Message ID | 1433684016-24340-1-git-send-email-ap420073@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
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 <ap420073@gmail.com> > --- 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 <Larry.Finger@lwfinger.net> 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); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2015-06-08 0:05 GMT+09:00 Larry Finger <Larry.Finger@lwfinger.net>: > 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 <ap420073@gmail.com> >> --- > > > 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 <Larry.Finger@lwfinger.net> > > 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? -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/07/2015 10:18 AM, Taehee Yoo wrote: > 2015-06-08 0:05 GMT+09:00 Larry Finger <Larry.Finger@lwfinger.net>: >> 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 <ap420073@gmail.com> >>> --- >> >> >> 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 <Larry.Finger@lwfinger.net> >> >> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> 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 <ap420073@gmail.com> > Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Thanks, applied to wireless-drivers-next.git. Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Kalle Valo <kvalo@codeaurora.org> 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 <ap420073@gmail.com> >> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> > > 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
On 06/15/2015 07:35 AM, Kalle Valo wrote: > Kalle Valo <kvalo@codeaurora.org> 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 <ap420073@gmail.com> >>> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> >> >> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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); }
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 <ap420073@gmail.com> --- drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)