365-brcmfmac-check-result-of-USB-firmware-request.patch 1.0 KB

123456789101112131415161718192021222324252627282930313233
  1. From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
  2. Date: Thu, 7 May 2015 14:13:03 +0200
  3. Subject: [PATCH] brcmfmac: check result of USB firmware request
  4. MIME-Version: 1.0
  5. Content-Type: text/plain; charset=UTF-8
  6. Content-Transfer-Encoding: 8bit
  7. This prevents silence failures with driver waiting (infinitely) for a
  8. callback.
  9. Signed-off-by: Rafał Miłecki <[email protected]>
  10. Acked-by: Arend van Spriel <[email protected]>
  11. Signed-off-by: Kalle Valo <[email protected]>
  12. ---
  13. --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
  14. +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
  15. @@ -1270,8 +1270,13 @@ static int brcmf_usb_probe_cb(struct brc
  16. bus->chiprev = bus_pub->chiprev;
  17. /* request firmware here */
  18. - brcmf_fw_get_firmwares(dev, 0, brcmf_usb_get_fwname(devinfo), NULL,
  19. - brcmf_usb_probe_phase2);
  20. + ret = brcmf_fw_get_firmwares(dev, 0, brcmf_usb_get_fwname(devinfo),
  21. + NULL, brcmf_usb_probe_phase2);
  22. + if (ret) {
  23. + brcmf_err("firmware request failed: %d\n", ret);
  24. + goto fail;
  25. + }
  26. +
  27. return 0;
  28. fail: