summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2009-04-20 14:37:01 -0700
committerJohn W. Linville <linville@tuxdriver.com>2009-04-21 16:43:32 -0400
commit71d449b55abf5018d7c711b2b62abc0c083723c4 (patch)
treec78adf94b8e87d450bf4071fd598183e0ae1a070 /drivers/net/wireless
parent4b6f764e148a194f792e75d43dc3504bc0d81064 (diff)
downloadblackbird-op-linux-71d449b55abf5018d7c711b2b62abc0c083723c4.tar.gz
blackbird-op-linux-71d449b55abf5018d7c711b2b62abc0c083723c4.zip
iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll
Users reported lockup with work still trying to run after module has been unloaded. http://thread.gmane.org/gmane.linux.kernel.wireless.general/30594/focus=30601 Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Reported-by: TJ <ubuntu@tjworld.net> Reported-by: Huaxu Wan <huaxu.wan@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index da61ecd62882..1299479f99dc 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -5196,7 +5196,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
sysfs_remove_group(&pdev->dev.kobj, &iwl3945_attribute_group);
iwl_rfkill_unregister(priv);
- cancel_delayed_work(&priv->rfkill_poll);
+ cancel_delayed_work_sync(&priv->rfkill_poll);
iwl3945_dealloc_ucode_pci(priv);
OpenPOWER on IntegriCloud