aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-01-29 21:36:01 -0500
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2012-02-02 17:38:34 -0500
commitf057ac4ed77d3390b517ee2be8e88615b9994272 (patch)
treedabf4f0d82e94ded316b884b38b6dd6fc985990a /drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
parentedf38334061cb87c68cfc7fdc192c850b7e02320 (diff)
iwlwifi: release IRQ in error path
smatch correctly complains: iwl-trans-pcie.c +1528 iwl_trans_pcie_start_hw(50) warn: 'trans->irq' was not released on error Fix it. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi W Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans-pcie.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index ec26950ebb55..836caf9c68b3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1504,7 +1504,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
1504 err = iwl_prepare_card_hw(trans); 1504 err = iwl_prepare_card_hw(trans);
1505 if (err) { 1505 if (err) {
1506 IWL_ERR(trans, "Error while preparing HW: %d", err); 1506 IWL_ERR(trans, "Error while preparing HW: %d", err);
1507 goto error; 1507 goto err_free_irq;
1508 } 1508 }
1509 1509
1510 iwl_apm_init(trans); 1510 iwl_apm_init(trans);
@@ -1522,6 +1522,8 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
1522 1522
1523 return err; 1523 return err;
1524 1524
1525err_free_irq:
1526 free_irq(trans->irq, trans);
1525error: 1527error:
1526 iwl_free_isr_ict(trans); 1528 iwl_free_isr_ict(trans);
1527 tasklet_kill(&trans_pcie->irq_tasklet); 1529 tasklet_kill(&trans_pcie->irq_tasklet);