From: Joonwoo Park <joonwpark81@gmail.com>
Date: Thu, 29 Nov 2007 01:42:49 +0000 (+0900)
Subject: iwlwifi 3945 Fix race conditional panic.
X-Git-Tag: v2.6.24-rc4~9^2~25^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e47eb6ad41e8fc4c2696665512b70d1fd4cf3f22;p=~shefty%2Frdma-dev.git

iwlwifi 3945 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/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index ae89a0f2c79..4bdf237f6ad 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);