aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-5000.c
diff options
context:
space:
mode:
authorRon Rindjunsky <ron.rindjunsky@intel.com>2008-05-29 04:35:06 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-03 15:00:23 -0400
commitfe9b6b720bd11c598417529755ac850a85070560 (patch)
tree4b87cb64ce53800c7182929088ef92b9c689f78c /drivers/net/wireless/iwlwifi/iwl-5000.c
parent7c616cba240cd0d579c996be3f3603456acfb0ad (diff)
iwlwifi: activate status ready timeout only for run time ucode
This patch makes driver state timeout checks on ucode alive response only if run time ucode have been loaded. Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-5000.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index eb6141e6edbc..685a84e5a021 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -804,8 +804,11 @@ static int iwl5000_alive_notify(struct iwl_priv *priv)
804 804
805 iwl5000_send_Xtal_calib(priv); 805 iwl5000_send_Xtal_calib(priv);
806 806
807 if (priv->ucode_type == UCODE_RT) 807 if (priv->ucode_type == UCODE_RT) {
808 iwl5000_send_calib_results(priv); 808 iwl5000_send_calib_results(priv);
809 set_bit(STATUS_READY, &priv->status);
810 priv->is_open = 1;
811 }
809 812
810 return 0; 813 return 0;
811} 814}