From 0db1b1236584aaae4b82c5735c67ed899ba15ba2 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 30 Jun 2008 17:23:26 +0800
Subject: [PATCH] --- yaml --- r: 103296 b: refs/heads/master c:
 0a078ffa011209c307880da10917ef205b4b11f4 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-5000.c     | 5 +----
 trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 51d76bf5249b..3d176a37f2c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9efa652cbfead13bbe200878f8a2d74f3543e1b
+refs/heads/master: 0a078ffa011209c307880da10917ef205b4b11f4
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c b/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c
index 099983f7306a..1be6ca435f3d 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/trunk/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/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
index a4aebe196003..5eb2a3eaf677 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/trunk/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;