Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60aa569f authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by John W. Linville
Browse files

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: default avatarLennert Buytenhek <buytenh@marvell.com>
Acked-by: default avatarNicolas Pitre <nico@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a94cc97e

drivers/net/wireless/mwl8k.c

+2 −2
Original line number Diff line number Diff line
@@ -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);