Skip to contentSkip to conversation

Patch "brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()" has been added to the 4.11-stable tree

PATCH [email protected] 1 participant 1 message Jun 27, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 35abcd4f9f303ac4f10f99b3f7e993e5f2e6fa37 Mon Sep 17 00:00:00 2001

From: Arend Van Spriel <[email protected]>
Date: Fri, 16 Jun 2017 09:36:35 +0100
Subject: brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()

From: Arend Van Spriel <[email protected]>

commit 35abcd4f9f303ac4f10f99b3f7e993e5f2e6fa37 upstream.

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 <[email protected]>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +1 -2
@@ -1163,14 +1163,13 @@ static void brcmf_usb_probe_phase2(struc
 				   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");

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/brcmfmac-add-parameter-to-pass-error-code-in-firmware-callback.patch queue-4.11/brcmfmac-use-firmware-callback-upon-failure-to-load.patch queue-4.11/brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch queue-4.11/brcmfmac-unbind-all-devices-upon-failure-in-firmware-callback.patch