Merge branch 'pci/msi' into next

* pci/msi:
  PCI/MSI: Add pci_enable_msi_range() and pci_enable_msix_range()
  PCI/MSI: Add pci_msix_vec_count()
  PCI/MSI: Remove pci_enable_msi_block_auto()
  PCI/MSI: Add pci_msi_vec_count()

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 16a1ce4f6b18..986f8eadfd39 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -79,9 +79,10 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
         u16 reg16;
         u32 reg32;
 
-        nr_entries = pci_msix_table_size(dev);
-        if (!nr_entries)
-                return -EINVAL;
+        nr_entries = pci_msix_vec_count(dev);
+        if (nr_entries < 0)
+                return nr_entries;
+        BUG_ON(!nr_entries);
         if (nr_entries > PCIE_PORT_MAX_MSIX_ENTRIES)
                 nr_entries = PCIE_PORT_MAX_MSIX_ENTRIES;