aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhijeet Kolekar <abhijeet.kolekar@intel.com>2010-02-26 15:17:01 -0800
committerReinette Chatre <reinette.chatre@intel.com>2010-03-09 16:13:25 -0800
commit75a9a92625a7d7401d04209f4226061cd2674b59 (patch)
treeb6f4e3ae5d5b3ec683569bb4c9a89cfc9af0801a
parentedc1a3a090e83c48d4b33c23aa16c54b3b790ef5 (diff)
downloadkernel_samsung_tuna-75a9a92625a7d7401d04209f4226061cd2674b59.zip
kernel_samsung_tuna-75a9a92625a7d7401d04209f4226061cd2674b59.tar.gz
kernel_samsung_tuna-75a9a92625a7d7401d04209f4226061cd2674b59.tar.bz2
iwl3945: check ucode load error code
Check successful completion of BSM loading. Give a chance to load BSM again. If BSM loading is unsuccessful we should exit and not initilize NIC. Before this checking even if the BSM loading failed driver tries to initilize the NIC which should not be the case. Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 252df12..2579bbc 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2697,7 +2697,7 @@ static int __iwl3945_up(struct iwl_priv *priv)
/* load bootstrap state machine,
* load bootstrap program into processor's memory,
* prepare to load the "initialize" uCode */
- priv->cfg->ops->lib->load_ucode(priv);
+ rc = priv->cfg->ops->lib->load_ucode(priv);
if (rc) {
IWL_ERR(priv,