Merge branch 'pci/msi' into next

[firefly-linux-kernel-4.4.55.git] / drivers / pci / pcie / portdrv_core.c

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 16a1ce4f6b18b3f323b785f261afc4d5ee136c81..986f8eadfd39397aff7d38c71452d86b3e6fa530 100644 (file)
--- 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;