--- /dev/null
+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");