diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-11-06 07:58:03 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-06 07:58:03 -0500 |
commit | fd88e5cca97cd30fe145d55538eecbf3658ea311 (patch) | |
tree | a458ec25ece79bfdba0a84ad00c3ad7352d785e0 /drivers/net/wireless/b43/main.c | |
parent | 845165446092e0212c3c0aec0f2eeb269b75d834 (diff) | |
parent | 8ddd4813010397b5aa3bf9f81de1994c415dfc10 (diff) |
Merge tag 'v3.4.18' into v3.4-rt
This is the 3.4.18 stable release
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index e4d6dc2e37d1..d6ffd434f413 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -5430,6 +5430,8 @@ static void b43_ssb_remove(struct ssb_device *sdev) 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) { /* Restore the queues count before unregistering, because firmware detect * might have modified it. Restoring is important, so the networking |