diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-01 15:39:36 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-01 15:39:36 +0400 |
| commit | e4d680c706284ca0413a84bd2a28fda76b360904 (patch) | |
| tree | 6613396dafb5c7d1f2d946ea8e7f4f57a482bad6 /drivers/net/wireless/b43legacy/main.c | |
| parent | a248afdc1b5916c2bfd007233112333d85aa28f6 (diff) | |
| parent | 5160b46f3e53c41c4c6b9e7cdbe0401d3afbfb63 (diff) | |
| download | linux-e4d680c706284ca0413a84bd2a28fda76b360904.tar.xz | |
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 291cdf654088..18e208e3eca1 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -3895,6 +3895,8 @@ static void b43legacy_remove(struct ssb_device *dev) cancel_work_sync(&wl->firmware_load); B43legacy_WARN_ON(!wl); + if (!wldev->fw.ucode) + return; /* NULL if fw never loaded */ if (wl->current_dev == wldev) ieee80211_unregister_hw(wl->hw); |