diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-01-14 20:48:06 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-01-31 16:17:28 -0500 |
commit | 10480b056662dc9595850598f0bbc5a16a4884f4 (patch) | |
tree | 5cb9859f901cc2aae2829e2a8db73a9ee50aaecc /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 78d12c237ca2e32ac6570b161d2137b5288c5511 (diff) |
iwlwifi: check ucode loading error and restart
Driver check alive message from ucode, if it is not ok, then need
to restart the loading process. instead of checking multiple places
for failure, only need to check in once place when receive alive
message from uCode.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 7c14eb31d954..ace0b98d91ae 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -251,14 +251,6 @@ static int iwl4965_set_ucode_ptrs(struct iwl_priv *priv) | |||
251 | */ | 251 | */ |
252 | static void iwl4965_init_alive_start(struct iwl_priv *priv) | 252 | static void iwl4965_init_alive_start(struct iwl_priv *priv) |
253 | { | 253 | { |
254 | /* Check alive response for "valid" sign from uCode */ | ||
255 | if (priv->card_alive_init.is_valid != UCODE_VALID_OK) { | ||
256 | /* We had an error bringing up the hardware, so take it | ||
257 | * all the way back down so we can try again */ | ||
258 | IWL_DEBUG_INFO(priv, "Initialize Alive failed.\n"); | ||
259 | goto restart; | ||
260 | } | ||
261 | |||
262 | /* Bootstrap uCode has loaded initialize uCode ... verify inst image. | 254 | /* Bootstrap uCode has loaded initialize uCode ... verify inst image. |
263 | * This is a paranoid check, because we would not have gotten the | 255 | * This is a paranoid check, because we would not have gotten the |
264 | * "initialize" alive if code weren't properly loaded. */ | 256 | * "initialize" alive if code weren't properly loaded. */ |