summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-04-05 09:42:01 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-04-07 15:51:38 -0400
commit7415952ff789b1c1878119662d4dc011ac9d261e (patch)
treee3ee6c33d287202c9dd5bd573671e96b26cc1748
parent901069c71415a76d731857ccda814e18ded062f7 (diff)
iwlagn: check more error return code
In alive notify, we should check return code instead of assume everything ok Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-ucode.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
index a7c913119f2..9c5abff6f04 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
@@ -432,6 +432,7 @@ int iwlagn_alive_notify(struct iwl_priv *priv)
unsigned long flags;
int i, chan;
u32 reg_val;
+ int ret;
spin_lock_irqsave(&priv->lock, flags);
@@ -527,9 +528,14 @@ int iwlagn_alive_notify(struct iwl_priv *priv)
iwl_clear_bits_prph(priv, APMG_PCIDEV_STT_REG,
APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
- iwlagn_send_wimax_coex(priv);
+ ret = iwlagn_send_wimax_coex(priv);
+ if (ret)
+ return ret;
+
+ ret = iwlagn_set_Xtal_calib(priv);
+ if (ret)
+ return ret;
- iwlagn_set_Xtal_calib(priv);
return iwl_send_calib_results(priv);
}