summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJoonwoo Park <joonwpark81@gmail.com>2007-11-29 10:42:49 +0900
committerJohn W. Linville <linville@tuxdriver.com>2007-11-29 21:34:54 -0500
commite47eb6ad41e8fc4c2696665512b70d1fd4cf3f22 (patch)
treeaaa7cc77dd02e6cfeee706e4d24cb62f8c2b07b7 /drivers/net/wireless
parent864792e3d93a89496e02ca21b2e2eeba0aa857ad (diff)
downloadlinux-e47eb6ad41e8fc4c2696665512b70d1fd4cf3f22.tar.gz
iwlwifi 3945 Fix race conditional panic.
Signed-off-by: Joonwoo Park <joonwpark81@gmail.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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index ae89a0f2c799..4bdf237f6adc 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -8277,6 +8277,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)
{
iwl_hw_cancel_deferred_work(priv);
+ cancel_delayed_work_sync(&priv->init_alive_start);
cancel_delayed_work(&priv->scan_check);
cancel_delayed_work(&priv->alive_start);
cancel_delayed_work(&priv->post_associate);