summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoonwoo Park <joonwpark81@gmail.com>2007-11-29 02:43:16 +0100
committerJohn W. Linville <linville@tuxdriver.com>2007-11-30 03:34:54 +0100
commit3ae6a054553ee8b7f74bf7de8904022b26705778 (patch)
tree4577c68ad6531d62a303c7665dad6fc5327afd64 /drivers
parentiwlwifi 3945 Fix race conditional panic. (diff)
downloadlinux-3ae6a054553ee8b7f74bf7de8904022b26705778.tar.xz
linux-3ae6a054553ee8b7f74bf7de8904022b26705778.zip
iwlwifi 4965 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')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 22d3bbc7be52..8f85564ec6fa 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -8870,6 +8870,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);