diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 7a9567c634c0..3f54decb310b 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -2857,9 +2857,6 @@ static void iwl_alive_start(struct iwl_priv *priv) | |||
2857 | /* After the ALIVE response, we can send host commands to 4965 uCode */ | 2857 | /* After the ALIVE response, we can send host commands to 4965 uCode */ |
2858 | set_bit(STATUS_ALIVE, &priv->status); | 2858 | set_bit(STATUS_ALIVE, &priv->status); |
2859 | 2859 | ||
2860 | /* Clear out the uCode error bit if it is set */ | ||
2861 | clear_bit(STATUS_FW_ERROR, &priv->status); | ||
2862 | |||
2863 | if (iwl_is_rfkill(priv)) | 2860 | if (iwl_is_rfkill(priv)) |
2864 | return; | 2861 | return; |
2865 | 2862 | ||
@@ -3099,6 +3096,9 @@ static int __iwl4965_up(struct iwl_priv *priv) | |||
3099 | continue; | 3096 | continue; |
3100 | } | 3097 | } |
3101 | 3098 | ||
3099 | /* Clear out the uCode error bit if it is set */ | ||
3100 | clear_bit(STATUS_FW_ERROR, &priv->status); | ||
3101 | |||
3102 | /* start card; "initialize" will load runtime ucode */ | 3102 | /* start card; "initialize" will load runtime ucode */ |
3103 | iwl4965_nic_start(priv); | 3103 | iwl4965_nic_start(priv); |
3104 | 3104 | ||