ath10k: Get rid of superfluous call to pci_disable_msi()
authorAlexander Gordeev <agordeev@redhat.com>
Thu, 13 Feb 2014 15:50:01 +0000 (17:50 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Thu, 13 Feb 2014 16:01:36 +0000 (18:01 +0200)
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>
drivers/net/wireless/ath/ath10k/pci.c

index 486412b9fec2173fae60bcfee704aadef78f0874..abcb7edb6485906aca0f140651f0ae67aa14e5a7 100644 (file)
@@ -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 */
        }