diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2014-01-13 01:11:39 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 23:05:47 +0400 |
commit | 06600864a0aa2827669c3bad96bf0081a7c4019e (patch) | |
tree | d647cf9d3a8bffbe1d4e4ba8bbbce772854b0ce5 | |
parent | 5cdc61ecc7d1753890162f5f59a5ddebc81d6b97 (diff) | |
download | linux-06600864a0aa2827669c3bad96bf0081a7c4019e.tar.xz |
b43legacy: Fix unload oops if firmware is not available
commit 452028665312672c6ba9e16a19248ee00ead9400 upstream.
The asyncronous firmware load uses a completion struct to hold firmware
processing until the user-space routines are up and running. There is.
however, a problem in that the waiter is nevered canceled during teardown.
As a result, unloading the driver when firmware is not available causes an oops.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 53696efbe155..ce7242454e95 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -3915,6 +3915,7 @@ static void b43legacy_remove(struct ssb_device *dev) * as the ieee80211 unreg will destroy the workqueue. */ cancel_work_sync(&wldev->restart_work); cancel_work_sync(&wl->firmware_load); + complete(&wldev->fw_load_complete); B43legacy_WARN_ON(!wl); if (!wldev->fw.ucode) |