diff options
author | John W. Linville | 2014-01-17 20:43:17 +0100 |
---|---|---|
committer | John W. Linville | 2014-01-17 20:43:17 +0100 |
commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /drivers/net/wireless/b43legacy/main.c | |
parent | Merge branch 'virtio_rx_merging' (diff) | |
parent | carl9170: use ath_is_mybeacon (diff) | |
download | kernel-qcow2-linux-7916a075571f0ccd0830cf3da293188a8b6045e3.tar.gz kernel-qcow2-linux-7916a075571f0ccd0830cf3da293188a8b6045e3.tar.xz kernel-qcow2-linux-7916a075571f0ccd0830cf3da293188a8b6045e3.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/b43legacy/main.c')
-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 572668821862..349c77605231 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -3919,6 +3919,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) |