Преглед на файлове

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>
Tomas Winkler преди 17 години
родител
ревизия
0a078ffa01
променени са 2 файла, в които са добавени 3 реда и са изтрити 6 реда
  1. 1 4
      drivers/net/wireless/iwlwifi/iwl-5000.c
  2. 2 2
      drivers/net/wireless/iwlwifi/iwl4965-base.c

+ 1 - 4
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);
 	iwl5000_send_Xtal_calib(priv);
 
 
-	if (priv->ucode_type == UCODE_RT) {
+	if (priv->ucode_type == UCODE_RT)
 		iwl5000_send_calib_results(priv);
 		iwl5000_send_calib_results(priv);
-		set_bit(STATUS_READY, &priv->status);
-		priv->is_open = 1;
-	}
 
 
 	return 0;
 	return 0;
 }
 }

+ 2 - 2
drivers/net/wireless/iwlwifi/iwl4965-base.c

@@ -2627,9 +2627,9 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw)
 			ret = -ETIMEDOUT;
 			ret = -ETIMEDOUT;
 			goto out_release_irq;
 			goto out_release_irq;
 		}
 		}
-
-		priv->is_open = 1;
 	}
 	}
+
+	priv->is_open = 1;
 	IWL_DEBUG_MAC80211("leave\n");
 	IWL_DEBUG_MAC80211("leave\n");
 	return 0;
 	return 0;