diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-27 13:14:47 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-27 13:14:47 -0500 |
| commit | eea79e0713d94b02952f6c591b615710fd40a562 (patch) | |
| tree | 053185ed326c93c8bd264d0b0dbd498f1d2fc8f3 /drivers/net/wireless/rt2x00/rt2x00dev.c | |
| parent | 203738e548cefc3fc3c2f73a9063176c9f3583d5 (diff) | |
| parent | 2b0a53d51b5f263bb581bbdb40ebb9f7e09609b1 (diff) | |
| download | linux-eea79e0713d94b02952f6c591b615710fd40a562.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
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 c3e1aa7c1a80..d2a1ea98d0f2 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -1220,7 +1220,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. |