summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Vossen <rvossen@broadcom.com>2011-02-15 10:13:50 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-18 21:04:54 (GMT)
commit59909c7c296a9f75ff395db2006de0aa6f57e7a7 (patch)
treefcb8788c8ce4ded63354739f03fd80df335daa46
parent02160695a40f915e5c0f5bbe1288365f6ac7cf8e (diff)
downloadlinux-fsl-qoriq-59909c7c296a9f75ff395db2006de0aa6f57e7a7.tar.xz
staging: brcm80211: bugfix for oops on firmware load problems
Upon firmware load failure, wl_release_fw() was called multiple times. This caused the driver to oops. Solution was to remove redundant wl_release_fw() calls. Signed-off-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/brcmsmac/wl_mac80211.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 18f1ccf..bf98a15 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -1804,7 +1804,6 @@ static int wl_request_fw(struct wl_info *wl, struct pci_dev *pdev)
if (status) {
WL_ERROR("%s: fail to load firmware %s\n",
KBUILD_MODNAME, fw_name);
- wl_release_fw(wl);
return status;
}
WL_NONE("request fw %s\n", fw_name);
@@ -1814,7 +1813,6 @@ static int wl_request_fw(struct wl_info *wl, struct pci_dev *pdev)
if (status) {
WL_ERROR("%s: fail to load firmware %s\n",
KBUILD_MODNAME, fw_name);
- wl_release_fw(wl);
return status;
}
wl->fw.hdr_num_entries[i] =