summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhijeet Kolekar2010-02-27 00:17:01 +0100
committerReinette Chatre2010-03-10 01:13:25 +0100
commit75a9a92625a7d7401d04209f4226061cd2674b59 (patch)
treeb6f4e3ae5d5b3ec683569bb4c9a89cfc9af0801a
parentiwlwifi: clean up queue/fifo handling (diff)
downloadkernel-qcow2-linux-75a9a92625a7d7401d04209f4226061cd2674b59.tar.gz
kernel-qcow2-linux-75a9a92625a7d7401d04209f4226061cd2674b59.tar.xz
kernel-qcow2-linux-75a9a92625a7d7401d04209f4226061cd2674b59.zip
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 252df12eeb38..2579bbcaab36 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,