* [PATCH] brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()
@ 2017-06-16 8:36 Arend van Spriel
2017-06-16 8:44 ` Kalle Valo
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Arend van Spriel @ 2017-06-16 8:36 UTC (permalink / raw)
To: Kalle Valo; +Cc: linux-wireless, Arend van Spriel, Stephen Rothwell
This fixes the following warning:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c: In function
'brcmf_usb_probe_phase2':
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c:1198:2:
warning: 'devinfo' may be used uninitialized in this function
[-Wmaybe-uninitialized]
mutex_unlock(&devinfo->dev_init_lock);
Fixes: 6d0507a777fb ("brcmfmac: add parameter to pass error code in firmware callback")
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
Hi Kalle,
Here it is. Was indeed a valid warning.
Thanks,
Arend
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
index 9ce3b55..8b16387 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
@@ -1164,14 +1164,13 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,
void *nvram, u32 nvlen)
{
struct brcmf_bus *bus = dev_get_drvdata(dev);
- struct brcmf_usbdev_info *devinfo;
+ struct brcmf_usbdev_info *devinfo = bus->bus_priv.usb->devinfo;;
if (ret)
goto error;
brcmf_dbg(USB, "Start fw downloading\n");
- devinfo = bus->bus_priv.usb->devinfo;
ret = check_file(fw->data);
if (ret < 0) {
brcmf_err("invalid firmware\n");
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()
2017-06-16 8:36 [PATCH] brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2() Arend van Spriel
@ 2017-06-16 8:44 ` Kalle Valo
2017-06-16 10:12 ` Arend van Spriel
2017-06-16 8:53 ` Kalle Valo
2017-06-18 4:26 ` [PATCH] " Julian Calaby
2 siblings, 1 reply; 6+ messages in thread
From: Kalle Valo @ 2017-06-16 8:44 UTC (permalink / raw)
To: Arend van Spriel; +Cc: linux-wireless, Stephen Rothwell
Arend van Spriel <arend.vanspriel@broadcom.com> writes:
> This fixes the following warning:
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c: In function
> 'brcmf_usb_probe_phase2':
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c:1198:2:
> warning: 'devinfo' may be used uninitialized in this function
> [-Wmaybe-uninitialized]
> mutex_unlock(&devinfo->dev_init_lock);
>
> Fixes: 6d0507a777fb ("brcmfmac: add parameter to pass error code in firmware callback")
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Reported-by: Kalle Valo <kvalo@codeaurora.org>
> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> ---
> Hi Kalle,
>
> Here it is. Was indeed a valid warning.
Thanks for the quick fix.
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
> @@ -1164,14 +1164,13 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,
> void *nvram, u32 nvlen)
> {
> struct brcmf_bus *bus = dev_get_drvdata(dev);
> - struct brcmf_usbdev_info *devinfo;
> + struct brcmf_usbdev_info *devinfo = bus->bus_priv.usb->devinfo;;
But an extra semicolon :) I'll try to edit it out during commit.
--
Kalle Valo
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()
2017-06-16 8:44 ` Kalle Valo
@ 2017-06-16 10:12 ` Arend van Spriel
0 siblings, 0 replies; 6+ messages in thread
From: Arend van Spriel @ 2017-06-16 10:12 UTC (permalink / raw)
To: Kalle Valo; +Cc: linux-wireless, Stephen Rothwell
On 6/16/2017 10:44 AM, Kalle Valo wrote:
> Arend van Spriel <arend.vanspriel@broadcom.com> writes:
>
>> This fixes the following warning:
>>
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c: In function
>> 'brcmf_usb_probe_phase2':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c:1198:2:
>> warning: 'devinfo' may be used uninitialized in this function
>> [-Wmaybe-uninitialized]
>> mutex_unlock(&devinfo->dev_init_lock);
>>
>> Fixes: 6d0507a777fb ("brcmfmac: add parameter to pass error code in firmware callback")
>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>> Reported-by: Kalle Valo <kvalo@codeaurora.org>
>> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
>> ---
>> Hi Kalle,
>>
>> Here it is. Was indeed a valid warning.
>
> Thanks for the quick fix.
Well, wanted to send it sooner, but ...
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> @@ -1164,14 +1164,13 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,
>> void *nvram, u32 nvlen)
>> {
>> struct brcmf_bus *bus = dev_get_drvdata(dev);
>> - struct brcmf_usbdev_info *devinfo;
>> + struct brcmf_usbdev_info *devinfo = bus->bus_priv.usb->devinfo;;
>
> But an extra semicolon :) I'll try to edit it out during commit.
needed time for the extra semicolon :-p Thanks for being thorough.
Gr. AvS
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()
2017-06-16 8:36 [PATCH] brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2() Arend van Spriel
2017-06-16 8:44 ` Kalle Valo
@ 2017-06-16 8:53 ` Kalle Valo
2017-06-18 4:26 ` [PATCH] " Julian Calaby
2 siblings, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2017-06-16 8:53 UTC (permalink / raw)
To: Arend Van Spriel; +Cc: linux-wireless, Arend van Spriel, Stephen Rothwell
Arend Van Spriel <arend.vanspriel@broadcom.com> wrote:
> This fixes the following warning:
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c: In function
> 'brcmf_usb_probe_phase2':
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c:1198:2:
> warning: 'devinfo' may be used uninitialized in this function
> [-Wmaybe-uninitialized]
> mutex_unlock(&devinfo->dev_init_lock);
>
> Fixes: 6d0507a777fb ("brcmfmac: add parameter to pass error code in firmware callback")
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Reported-by: Kalle Valo <kvalo@codeaurora.org>
> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Patch applied to wireless-drivers.git, thanks.
35abcd4f9f30 brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()
--
https://patchwork.kernel.org/patch/9790847/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()
2017-06-16 8:36 [PATCH] brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2() Arend van Spriel
2017-06-16 8:44 ` Kalle Valo
2017-06-16 8:53 ` Kalle Valo
@ 2017-06-18 4:26 ` Julian Calaby
2017-06-18 13:01 ` Arend van Spriel
2 siblings, 1 reply; 6+ messages in thread
From: Julian Calaby @ 2017-06-18 4:26 UTC (permalink / raw)
To: Arend van Spriel; +Cc: Kalle Valo, linux-wireless, Stephen Rothwell
Hi Arend,
On Fri, Jun 16, 2017 at 6:36 PM, Arend van Spriel
<arend.vanspriel@broadcom.com> wrote:
> This fixes the following warning:
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c: In function
> 'brcmf_usb_probe_phase2':
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c:1198:2:
> warning: 'devinfo' may be used uninitialized in this function
> [-Wmaybe-uninitialized]
> mutex_unlock(&devinfo->dev_init_lock);
>
> Fixes: 6d0507a777fb ("brcmfmac: add parameter to pass error code in firmware callback")
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Reported-by: Kalle Valo <kvalo@codeaurora.org>
> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
> index 9ce3b55..8b16387 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
> @@ -1164,14 +1164,13 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,
> void *nvram, u32 nvlen)
> {
> struct brcmf_bus *bus = dev_get_drvdata(dev);
> - struct brcmf_usbdev_info *devinfo;
> + struct brcmf_usbdev_info *devinfo = bus->bus_priv.usb->devinfo;;
>
> if (ret)
> goto error;
Completely unrelated to this specific patch, I just want to point out
that this construct looks _really_ weird.
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()
2017-06-18 4:26 ` [PATCH] " Julian Calaby
@ 2017-06-18 13:01 ` Arend van Spriel
0 siblings, 0 replies; 6+ messages in thread
From: Arend van Spriel @ 2017-06-18 13:01 UTC (permalink / raw)
To: Julian Calaby; +Cc: Kalle Valo, linux-wireless, Stephen Rothwell
On 18-06-17 06:26, Julian Calaby wrote:
> Hi Arend,
>
> On Fri, Jun 16, 2017 at 6:36 PM, Arend van Spriel
> <arend.vanspriel@broadcom.com> wrote:
>> This fixes the following warning:
>>
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c: In function
>> 'brcmf_usb_probe_phase2':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c:1198:2:
>> warning: 'devinfo' may be used uninitialized in this function
>> [-Wmaybe-uninitialized]
>> mutex_unlock(&devinfo->dev_init_lock);
>>
>> Fixes: 6d0507a777fb ("brcmfmac: add parameter to pass error code in firmware callback")
>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>> Reported-by: Kalle Valo <kvalo@codeaurora.org>
>> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
>> ---
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> index 9ce3b55..8b16387 100644
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
>> @@ -1164,14 +1164,13 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,
>> void *nvram, u32 nvlen)
>> {
>> struct brcmf_bus *bus = dev_get_drvdata(dev);
>> - struct brcmf_usbdev_info *devinfo;
>> + struct brcmf_usbdev_info *devinfo = bus->bus_priv.usb->devinfo;;
>>
>> if (ret)
>> goto error;
>
> Completely unrelated to this specific patch, I just want to point out
> that this construct looks _really_ weird.
Guess it might. This is a callback function in which the caller passes
the result. Could have chosen a better name than 'ret'. Other option
would have been a separate callback for the error handling, but I
decided that to be overkill.
Regards,
Arend
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-06-18 13:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-16 8:36 [PATCH] brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2() Arend van Spriel
2017-06-16 8:44 ` Kalle Valo
2017-06-16 10:12 ` Arend van Spriel
2017-06-16 8:53 ` Kalle Valo
2017-06-18 4:26 ` [PATCH] " Julian Calaby
2017-06-18 13:01 ` Arend van Spriel
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).