summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2009-08-03 21:59:09 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-08-07 13:09:33 -0400
commit60aa569f9212a13382c29cc734f275dec0f55e0b (patch)
tree975293c6e8cfe84ca93d3706fb8ed6c85db86128 /drivers/net/wireless
parenta94cc97e14c5750ec2b50b2e4ecdfb0f369ed0f4 (diff)
downloadblackbird-obmc-linux-60aa569f9212a13382c29cc734f275dec0f55e0b.tar.gz
blackbird-obmc-linux-60aa569f9212a13382c29cc734f275dec0f55e0b.zip
mwl8k: prevent module unload hang
We need to unregister our ieee80211_hw before resetting the chip, as the former causes firmware commands to be issued which will time out once the chip has been reset. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Acked-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/mwl8k.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 6e491171f73e..83967afe0821 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -3733,6 +3733,8 @@ static void __devexit mwl8k_remove(struct pci_dev *pdev)
ieee80211_stop_queues(hw);
+ ieee80211_unregister_hw(hw);
+
/* Remove tx reclaim tasklet */
tasklet_kill(&priv->tx_reclaim_task);
@@ -3746,8 +3748,6 @@ static void __devexit mwl8k_remove(struct pci_dev *pdev)
for (i = 0; i < MWL8K_TX_QUEUES; i++)
mwl8k_txq_reclaim(hw, i, 1);
- ieee80211_unregister_hw(hw);
-
for (i = 0; i < MWL8K_TX_QUEUES; i++)
mwl8k_txq_deinit(hw, i);
OpenPOWER on IntegriCloud