From: Joonwoo Park <joonwpark81@gmail.com>
Date: Thu, 29 Nov 2007 01:43:16 +0000 (+0900)
Subject: iwlwifi 4965 Fix race conditional panic.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3ae6a054553ee8b7f74bf7de8904022b26705778;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

iwlwifi 4965 Fix race conditional panic.

Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

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);