From: Roland Vossen <[email protected]>

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 <[email protected]>
Reviewed-by: Arend van Spriel <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/brcm80211/brcmsmac/wl_mac80211.c |    2 --
 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] =
-- 
1.7.4.1

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to