diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-29 20:53:21 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-29 20:53:21 +0100 |
| commit | 8701ff0a88bcfc8c7dced3842919ad8d016a6835 (patch) | |
| tree | ba71774b83e92d6507a398024a6d89b146181320 /drivers/net/wireless/rt2x00/rt2x00dev.c | |
| parent | ath9k: decouple RX error checking for DFS (diff) | |
| parent | mwifiex: reset encryption mode flag before association (diff) | |
| download | linux-8701ff0a88bcfc8c7dced3842919ad8d016a6835.tar.xz linux-8701ff0a88bcfc8c7dced3842919ad8d016a6835.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index dfe485a872f6..49a51b4195ef 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -1236,7 +1236,8 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) cancel_work_sync(&rt2x00dev->rxdone_work); cancel_work_sync(&rt2x00dev->txdone_work); } - destroy_workqueue(rt2x00dev->workqueue); + if (rt2x00dev->workqueue) + destroy_workqueue(rt2x00dev->workqueue); /* * Free the tx status fifo. |