Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59909c7c authored Feb 15, 2011 by Roland Vossen Committed by Greg Kroah-Hartman Feb 18, 2011

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>

parent 02160695

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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] =