From 899f678951d9f44e9384af83626bce96e05824bf Mon Sep 17 00:00:00 2001 From: Joonwoo Park Date: Thu, 29 Nov 2007 10:43:16 +0900 Subject: [PATCH] --- yaml --- r: 74465 b: refs/heads/master c: 3ae6a054553ee8b7f74bf7de8904022b26705778 h: refs/heads/master i: 74463: b56692d7bc2d485084e506db8106d6b900d4a9a3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dfacfe186bdb..4631352943cc 100644 --- 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 index 22d3bbc7be52..8f85564ec6fa 100644 --- 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);