From a4ffaeacd59930ccc5fdfdae9f733b209c567ec4 Mon Sep 17 00:00:00 2001 From: Reinette Chatre Date: Thu, 3 Apr 2008 16:05:23 -0700 Subject: [PATCH] --- yaml --- r: 90578 b: refs/heads/master c: fe00b5a5b7e29180e427e58b3d0a185d1dd3f105 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 ++-- trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cadbbd7987dc..350970963159 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc92e49729142047bce8f14762accb322962b585 +refs/heads/master: fe00b5a5b7e29180e427e58b3d0a185d1dd3f105 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c index 51480a4920e8..d4daa04465a3 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -5874,12 +5874,12 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv) iwl3945_reg_txpower_periodic(priv); + iwl3945_led_register(priv); + IWL_DEBUG_INFO("ALIVE processing complete.\n"); set_bit(STATUS_READY, &priv->status); wake_up_interruptible(&priv->wait_command_queue); - iwl3945_led_register(priv); - if (priv->error_recovering) iwl3945_error_recovery(priv); diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index 5dfc414792c1..4517e4ce3a25 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -5701,12 +5701,12 @@ static void iwl4965_alive_start(struct iwl_priv *priv) iwl4965_rf_kill_ct_config(priv); + iwl_leds_register(priv); + IWL_DEBUG_INFO("ALIVE processing complete.\n"); set_bit(STATUS_READY, &priv->status); wake_up_interruptible(&priv->wait_command_queue); - iwl_leds_register(priv); - if (priv->error_recovering) iwl4965_error_recovery(priv);