| From f89ff6441df06abc2d95f3ef67525923032d6283 Mon Sep 17 00:00:00 2001 |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| Date: Wed, 24 Oct 2012 08:57:16 -0500 |
| Subject: b43: Fix oops on unload when firmware not found |
| |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| |
| commit f89ff6441df06abc2d95f3ef67525923032d6283 upstream. |
| |
| When b43 fails to find firmware when loaded, a subsequent unload will |
| oops due to calling ieee80211_unregister_hw() when the corresponding |
| register call was never made. |
| |
| Commit 2d838bb608e2d1f6cb4280e76748cb812dc822e7 fixed the same problem |
| for b43legacy. |
| |
| Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> |
| Tested-by: Markus Kanet <dvmailing@gmx.eu> |
| Cc: Markus Kanet <dvmailing@gmx.eu> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/b43/main.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/net/wireless/b43/main.c |
| +++ b/drivers/net/wireless/b43/main.c |
| @@ -5374,6 +5374,8 @@ static void b43_bcma_remove(struct bcma_ |
| cancel_work_sync(&wldev->restart_work); |
| |
| B43_WARN_ON(!wl); |
| + if (!wldev->fw.ucode.data) |
| + return; /* NULL if firmware never loaded */ |
| if (wl->current_dev == wldev && wl->hw_registred) { |
| b43_leds_stop(wldev); |
| ieee80211_unregister_hw(wl->hw); |
| @@ -5448,6 +5450,8 @@ static void b43_ssb_remove(struct ssb_de |
| cancel_work_sync(&wldev->restart_work); |
| |
| B43_WARN_ON(!wl); |
| + if (!wldev->fw.ucode.data) |
| + return; /* NULL if firmware never loaded */ |
| if (wl->current_dev == wldev && wl->hw_registred) { |
| b43_leds_stop(wldev); |
| ieee80211_unregister_hw(wl->hw); |
