From: Tomas Winkler Date: Mon, 30 Jun 2008 09:23:26 +0000 (+0800) Subject: iwlwifi: fix 4965 uCode load X-Git-Tag: v2.6.27-rc1~969^2~224^2~8 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a078ffa011209c307880da10917ef205b4b11f4;p=linux-2.6 iwlwifi: fix 4965 uCode load This patch fixes uCode load in 4965 HW Signed-off-by: Tomas Winkler Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 099983f730..1be6ca435f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -807,11 +807,8 @@ static int iwl5000_alive_notify(struct iwl_priv *priv) iwl5000_send_Xtal_calib(priv); - if (priv->ucode_type == UCODE_RT) { + if (priv->ucode_type == UCODE_RT) iwl5000_send_calib_results(priv); - set_bit(STATUS_READY, &priv->status); - priv->is_open = 1; - } return 0; } diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index a4aebe1960..5eb2a3eaf6 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -2627,9 +2627,9 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw) ret = -ETIMEDOUT; goto out_release_irq; } - - priv->is_open = 1; } + + priv->is_open = 1; IWL_DEBUG_MAC80211("leave\n"); return 0;