mac80211: backport today's brcmfmac changes
[openwrt/svn-archive/archive.git] / package / kernel / mac80211 / patches / 365-brcmfmac-check-result-of-USB-firmware-request.patch
1 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
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
8 This prevents silence failures with driver waiting (infinitely) for a
9 callback.
10
11 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
12 Acked-by: Arend van Spriel <arend@broadcom.com>
13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
14 ---
15
16 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
17 +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
18 @@ -1270,8 +1270,13 @@ static int brcmf_usb_probe_cb(struct brc
19 bus->chiprev = bus_pub->chiprev;
20
21 /* request firmware here */
22 - brcmf_fw_get_firmwares(dev, 0, brcmf_usb_get_fwname(devinfo), NULL,
23 - brcmf_usb_probe_phase2);
24 + ret = brcmf_fw_get_firmwares(dev, 0, brcmf_usb_get_fwname(devinfo),
25 + NULL, brcmf_usb_probe_phase2);
26 + if (ret) {
27 + brcmf_err("firmware request failed: %d\n", ret);
28 + goto fail;
29 + }
30 +
31 return 0;
32
33 fail: