---

yaml --- r: 74465 b: refs/heads/master c: 3ae6a05 h: refs/heads/master i: 74463: b56692d v: v3
git-mirror · Nov 30, 2007 · 899f678 · 899f678
1 parent 60023f7
commit 899f678
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e47eb6ad41e8fc4c2696665512b70d1fd4cf3f22
+refs/heads/master: 3ae6a054553ee8b7f74bf7de8904022b26705778
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/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);