Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 591ecdb8 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: fix failpath in MSI-X setup 



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: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 0dbd09e6

drivers/net/wireless/ath/ath10k/pci.c

+6 −1
Original line number Diff line number Diff line
@@ -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,