Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 87897b95666d..ded76c101dde 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -858,13 +858,9 @@ static int mthca_enable_msi_x(struct mthca_dev *mdev)
         entries[1].entry = 1;
         entries[2].entry = 2;
 
-        err = pci_enable_msix(mdev->pdev, entries, ARRAY_SIZE(entries));
-        if (err) {
-                if (err > 0)
-                        mthca_info(mdev, "Only %d MSI-X vectors available, "
-                                   "not using MSI-X\n", err);
+        err = pci_enable_msix_exact(mdev->pdev, entries, ARRAY_SIZE(entries));
+        if (err)
                 return err;
-        }
 
         mdev->eq_table.eq[MTHCA_EQ_COMP ].msi_x_vector = entries[0].vector;
         mdev->eq_table.eq[MTHCA_EQ_ASYNC].msi_x_vector = entries[1].vector;