From: Alexander Gordeev <agordeev@redhat.com>
Date: Thu, 13 Feb 2014 15:50:01 +0000 (+0200)
Subject: ath10k: Get rid of superfluous call to pci_disable_msi()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bdcb2c9e2f9e40639e4b212d08d8cdba54932c0d;p=linux-beck.git

ath10k: Get rid of superfluous call to pci_disable_msi()

The documentation states that pci_enable_msi_block() returns the number of
requests 'could have been allocated', not 'could allocate'. IOW, MSIs are *not*
enabled if a positive value returned.

kvalo: add commit log based on Alexander's email

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 486412b9fec2..abcb7edb6485 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2532,8 +2532,6 @@ static int ath10k_pci_init_irq(struct ath10k *ar)
 		ret = pci_enable_msi_block(ar_pci->pdev, ar_pci->num_msi_intrs);
 		if (ret == 0)
 			return 0;
-		if (ret > 0)
-			pci_disable_msi(ar_pci->pdev);
 
 		/* fall-through */
 	}