diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-05 12:42:01 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-07 15:51:38 -0400 |
commit | 7415952ff789b1c1878119662d4dc011ac9d261e (patch) | |
tree | e3ee6c33d287202c9dd5bd573671e96b26cc1748 | |
parent | 901069c71415a76d731857ccda814e18ded062f7 (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.c | 10 |
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) | |||
432 | unsigned long flags; | 432 | unsigned long flags; |
433 | int i, chan; | 433 | int i, chan; |
434 | u32 reg_val; | 434 | u32 reg_val; |
435 | int ret; | ||
435 | 436 | ||
436 | spin_lock_irqsave(&priv->lock, flags); | 437 | spin_lock_irqsave(&priv->lock, flags); |
437 | 438 | ||
@@ -527,9 +528,14 @@ int iwlagn_alive_notify(struct iwl_priv *priv) | |||
527 | iwl_clear_bits_prph(priv, APMG_PCIDEV_STT_REG, | 528 | iwl_clear_bits_prph(priv, APMG_PCIDEV_STT_REG, |
528 | APMG_PCIDEV_STT_VAL_L1_ACT_DIS); | 529 | APMG_PCIDEV_STT_VAL_L1_ACT_DIS); |
529 | 530 | ||
530 | iwlagn_send_wimax_coex(priv); | 531 | ret = iwlagn_send_wimax_coex(priv); |
532 | if (ret) | ||
533 | return ret; | ||
534 | |||
535 | ret = iwlagn_set_Xtal_calib(priv); | ||
536 | if (ret) | ||
537 | return ret; | ||
531 | 538 | ||
532 | iwlagn_set_Xtal_calib(priv); | ||
533 | return iwl_send_calib_results(priv); | 539 | return iwl_send_calib_results(priv); |
534 | } | 540 | } |
535 | 541 | ||