]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
iwl3945: check ucode load error code
authorAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Fri, 26 Feb 2010 23:17:01 +0000 (15:17 -0800)
committerReinette Chatre <reinette.chatre@intel.com>
Wed, 10 Mar 2010 00:13:25 +0000 (16:13 -0800)
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>
drivers/net/wireless/iwlwifi/iwl3945-base.c

index 252df12eeb384c2ac79428b4869e78b9e17969ea..2579bbcaab3677240dd16c3e3e1a0cd2392aedb6 100644 (file)
@@ -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,