linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] ath10k: fix MSI-X setup failpath
       [not found] <1372150661-6862-1-git-send-email-michal.kazior@tieto.com>
@ 2013-06-26  6:50 ` Michal Kazior
  2013-07-05 13:23   ` [ath9k-devel] " Kalle Valo
  0 siblings, 1 reply; 2+ messages in thread
From: Michal Kazior @ 2013-06-26  6:50 UTC (permalink / raw)
  To: ath9k-devel, linux-wireless; +Cc: Michal Kazior

Irqs were not freed up correctly upon msi-x setup
failure.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
---
 drivers/net/wireless/ath/ath10k/pci.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 1a59638..63c58b5 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -1882,9 +1882,10 @@ static int ath10k_pci_start_intr_msix(struct ath10k *ar, int num)
 			ath10k_warn("request_irq(%d) failed %d\n",
 				    ar_pci->pdev->irq + i, ret);
 
-			for (; i >= MSI_ASSIGN_CE_INITIAL; i--)
-				free_irq(ar_pci->pdev->irq, ar);
+			for (i--; i >= MSI_ASSIGN_CE_INITIAL; i--)
+				free_irq(ar_pci->pdev->irq + i, ar);
 
+			free_irq(ar_pci->pdev->irq + MSI_ASSIGN_FW, ar);
 			pci_disable_msi(ar_pci->pdev);
 			return ret;
 		}
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [ath9k-devel] [PATCH v2] ath10k: fix MSI-X setup failpath
  2013-06-26  6:50 ` [PATCH v2] ath10k: fix MSI-X setup failpath Michal Kazior
@ 2013-07-05 13:23   ` Kalle Valo
  0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2013-07-05 13:23 UTC (permalink / raw)
  To: Michal Kazior; +Cc: ath9k-devel, linux-wireless

Michal Kazior <michal.kazior@tieto.com> writes:

> Irqs were not freed up correctly upon msi-x setup
> failure.
>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>

John has already applied this.

-- 
Kalle Valo

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-07-05 13:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1372150661-6862-1-git-send-email-michal.kazior@tieto.com>
2013-06-26  6:50 ` [PATCH v2] ath10k: fix MSI-X setup failpath Michal Kazior
2013-07-05 13:23   ` [ath9k-devel] " Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).