]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Jun 2017 12:49:31 +0000 (14:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Jun 2017 12:49:31 +0000 (14:49 +0200)
added patches:
brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch

queue-4.9/brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch [new file with mode: 0644]
queue-4.9/series

diff --git a/queue-4.9/brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch b/queue-4.9/brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch
new file mode 100644 (file)
index 0000000..1b2fb5b
--- /dev/null
@@ -0,0 +1,47 @@
+From 35abcd4f9f303ac4f10f99b3f7e993e5f2e6fa37 Mon Sep 17 00:00:00 2001
+From: Arend Van Spriel <arend.vanspriel@broadcom.com>
+Date: Fri, 16 Jun 2017 09:36:35 +0100
+Subject: brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()
+
+From: Arend Van Spriel <arend.vanspriel@broadcom.com>
+
+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 <sfr@canb.auug.org.au>
+Reported-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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");
index be3fc454275c4a43a1124cbda28dc45f31fcf324..1cb20b5c526c8c8d67eba6bd3e3a6226a5203c12 100644 (file)
@@ -41,3 +41,4 @@ dmaengine-bcm2835-fix-cyclic-dma-period-splitting.patch
 spi-double-time-out-tolerance.patch
 net-phy-fix-marvell-phy-status-reading.patch
 jump-label-fix-passing-kbuild_cflags-when-checking-for-asm-goto-support.patch
+brcmfmac-fix-uninitialized-warning-in-brcmf_usb_probe_phase2.patch