diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-07-06 16:26:34 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-07-06 16:26:34 +0000 |
commit | b30e092de65ca7be7cb277f934016484137d924c (patch) | |
tree | 85f6bba930e34344d746b1674209cc3f03a56a51 /package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch | |
parent | 32549f52cb0f2a9316d894909b3fbef452d7b493 (diff) | |
download | master-31e0f0ae-b30e092de65ca7be7cb277f934016484137d924c.tar.gz master-31e0f0ae-b30e092de65ca7be7cb277f934016484137d924c.tar.bz2 master-31e0f0ae-b30e092de65ca7be7cb277f934016484137d924c.zip |
mac80211: update to version 2015-06-22
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 46198
Diffstat (limited to 'package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch')
-rw-r--r-- | package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch b/package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch deleted file mode 100644 index 9b2880d8fc..0000000000 --- a/package/kernel/mac80211/patches/365-brcmfmac-check-result-of-USB-firmware-request.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> -Date: Thu, 7 May 2015 14:13:03 +0200 -Subject: [PATCH] brcmfmac: check result of USB firmware request -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -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> ---- - ---- 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 brc - 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: |