summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac/usb.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-05-07 14:13:03 +0200
committerKalle Valo <kvalo@codeaurora.org>2015-05-09 17:00:46 +0300
commit6e65104504feaff41848defcef9c2c16c119f90c (patch)
tree17d705c2dbb419f4cbe117b78252bc54773d8f87 /drivers/net/wireless/brcm80211/brcmfmac/usb.c
parentd5c5181cd9fac12c9ea1ba3a250c77dca768410e (diff)
downloadlinux-6e65104504feaff41848defcef9c2c16c119f90c.tar.gz
linux-6e65104504feaff41848defcef9c2c16c119f90c.tar.bz2
linux-6e65104504feaff41848defcef9c2c16c119f90c.zip
brcmfmac: check result of USB firmware request
This prevents silence failures with driver waiting (infinitely) for a callback. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Acked-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/usb.c')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/usb.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 5df6aa72cc2d..daba86d881bc 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -1270,8 +1270,13 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
bus->chiprev = bus_pub->chiprev;
/* request firmware here */
- brcmf_fw_get_firmwares(dev, 0, brcmf_usb_get_fwname(devinfo), NULL,
- brcmf_usb_probe_phase2);
+ ret = brcmf_fw_get_firmwares(dev, 0, brcmf_usb_get_fwname(devinfo),
+ NULL, brcmf_usb_probe_phase2);
+ if (ret) {
+ brcmf_err("firmware request failed: %d\n", ret);
+ goto fail;
+ }
+
return 0;
fail: