From: Roland Vossen Date: Tue, 15 Feb 2011 10:13:50 +0000 (+0100) Subject: staging: brcm80211: bugfix for oops on firmware load problems X-Git-Tag: MMI-PSA29.97-13-9~20521^2~524 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59909c7c296a9f75ff395db2006de0aa6f57e7a7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Reviewed-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 18f1ccfa0d4f..bf98a151de6d 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] =