]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
brcmfmac: check result of USB firmware request
authorRafał Miłecki <zajec5@gmail.com>
Thu, 7 May 2015 12:13:03 +0000 (14:13 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Sat, 9 May 2015 14:00:46 +0000 (17:00 +0300)
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>
drivers/net/wireless/brcm80211/brcmfmac/usb.c

index 5df6aa72cc2db32c5ccca6f76c50d79dc05914ed..daba86d881bc1a4930f84ef8ebc5078bde4710e3 100644 (file)
@@ -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: