Return-path: Received: from ebb05.tieto.com ([131.207.168.36]:47387 "EHLO ebb05.tieto.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759229Ab3GaIz1 (ORCPT ); Wed, 31 Jul 2013 04:55:27 -0400 From: Michal Kazior To: CC: , Michal Kazior Subject: [PATCH 5/5] ath10k: fix failpath in MSI-X setup Date: Wed, 31 Jul 2013 10:55:15 +0200 Message-ID: <1375260915-22500-6-git-send-email-michal.kazior@tieto.com> (sfid-20130731_105544_804529_6C4C830D) In-Reply-To: <1375260915-22500-1-git-send-email-michal.kazior@tieto.com> References: <1375260915-22500-1-git-send-email-michal.kazior@tieto.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-wireless-owner@vger.kernel.org List-ID: pci_disable_msi() must be called if the initial request_irq() fails. Also add a warning message so it's possible to distinguish request_irq() failure and pci_enable_msi() failure. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/pci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index c71b488..d95439b 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -1990,8 +1990,13 @@ static int ath10k_pci_start_intr_msix(struct ath10k *ar, int num) ret = request_irq(ar_pci->pdev->irq + MSI_ASSIGN_FW, ath10k_pci_msi_fw_handler, IRQF_SHARED, "ath10k_pci", ar); - if (ret) + if (ret) { + ath10k_warn("request_irq(%d) failed %d\n", + ar_pci->pdev->irq + MSI_ASSIGN_FW, ret); + + pci_disable_msi(ar_pci->pdev); return ret; + } for (i = MSI_ASSIGN_CE_INITIAL; i <= MSI_ASSIGN_CE_MAX; i++) { ret = request_irq(ar_pci->pdev->irq + i, -- 1.7.9.5