From: Greg Kroah-Hartman Date: Tue, 27 Jun 2017 12:49:15 +0000 (+0200) Subject: 4.11-stable patches X-Git-Tag: v3.18.59~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=205c8d038dfef8bf31c21d68798748f05bd76406;p=thirdparty%2Fkernel%2Fstable-queue.git 4.11-stable patches added patches: brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch --- diff --git a/queue-4.11/brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch b/queue-4.11/brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch new file mode 100644 index 00000000000..1b2fb5bd0e4 --- /dev/null +++ b/queue-4.11/brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch @@ -0,0 +1,47 @@ +From 35abcd4f9f303ac4f10f99b3f7e993e5f2e6fa37 Mon Sep 17 00:00:00 2001 +From: Arend Van Spriel +Date: Fri, 16 Jun 2017 09:36:35 +0100 +Subject: brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2() + +From: Arend Van Spriel + +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 +Reported-by: Kalle Valo +Signed-off-by: Arend van Spriel +Signed-off-by: Kalle Valo +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +@@ -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"); diff --git a/queue-4.11/series b/queue-4.11/series index df875c30875..a4c3dc61a37 100644 --- a/queue-4.11/series +++ b/queue-4.11/series @@ -55,3 +55,4 @@ spi-double-time-out-tolerance.patch net-phy-fix-marvell-phy-status-reading.patch netfilter-xtables-zero-padding-in-data_to_user.patch netfilter-xtables-fix-build-failure-from-compat_xt_align-outside-config_compat.patch +brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch