From 0a078ffa011209c307880da10917ef205b4b11f4 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 30 Jun 2008 17:23:26 +0800
Subject: iwlwifi: fix 4965 uCode load
This patch fixes uCode load in 4965 HW
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/iwlwifi/iwl-5000.c | 5 +----
drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 ++--
2 files changed, 3 insertions(+), 6 deletions(-)
(limited to 'drivers/net')
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 099983f7306a..1be6ca435f3d 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 a4aebe196003..5eb2a3eaf677 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;
--
cgit v1.2.3