diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-02-07 16:54:50 -0800 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-02-21 10:08:38 -0800 |
| commit | 46d0637a128f2f555c1f7be02cd65c45b92b2a60 (patch) | |
| tree | 4fc585bf2e6b0cc3d8a9f1215c16b6329e2e1105 /drivers/net/wireless/iwlwifi | |
| parent | 491bc292766330473eac4569be5d57f9aeb80112 (diff) | |
| download | op-kernel-dev-46d0637a128f2f555c1f7be02cd65c45b92b2a60.zip op-kernel-dev-46d0637a128f2f555c1f7be02cd65c45b92b2a60.tar.gz | |
iwlwifi: Loading correct uCode again when fail to load
During uCode loading, if the reply_alive come back with "failure",
try to load the same uCode again.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index abd0461..c04d991 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -466,6 +466,15 @@ static void iwl_rx_reply_alive(struct iwl_priv *priv, IWL_WARN(priv, "%s uCode did not respond OK.\n", (palive->ver_subtype == INITIALIZE_SUBTYPE) ? "init" : "runtime"); + /* + * If fail to load init uCode, + * let's try to load the init uCode again. + * We should not get into this situation, but if it + * does happen, we should not move on and loading "runtime" + * without proper calibrate the device. + */ + if (palive->ver_subtype == INITIALIZE_SUBTYPE) + priv->ucode_type = UCODE_NONE; queue_work(priv->workqueue, &priv->restart); } } |
