From b6fbed2377acf5e0be7fb3632784b426a465a148 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Thu, 12 Jun 2008 09:47:17 +0800 Subject: [PATCH] --- yaml --- r: 102948 b: refs/heads/master c: 808e72a088d164cf0030f593d9a5fc23306fb6b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 ++- trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d34a84ebb8ad..011faeb6ccd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95483b69c8c0d49e43c97ecb5eb3cbec48a02d61 +refs/heads/master: 808e72a088d164cf0030f593d9a5fc23306fb6b6 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c index 72279e07fe32..d0084bcb1eca 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -2875,7 +2875,8 @@ static void iwl3945_radio_kill_sw(struct iwl3945_priv *priv, int disable_radio) return; } - queue_work(priv->workqueue, &priv->restart); + if (priv->is_open) + queue_work(priv->workqueue, &priv->restart); return; } diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index 8f1ab23e9d61..5aec7d5fb9cc 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -970,7 +970,8 @@ int iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio) return 0; } - queue_work(priv->workqueue, &priv->restart); + if (priv->is_open) + queue_work(priv->workqueue, &priv->restart); return 1; }