powerpc/pseries: Check for MSI-X also in rtas_msi_pci_irq_fixup()

We also need to check that the device isn't using MSI-X in the irq fixup
routine, otherwise we might leave MSI-Xs configured at boot.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index acf1070d65c0..e6c80ac07697 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -244,8 +244,8 @@ static void rtas_msi_pci_irq_fixup(struct pci_dev *pdev)
         }
 
         /* No MSI -> MSIs can't have been assigned by fw, leave LSI */
-        if (check_req_msi(pdev, 1)) {
-                dev_dbg(&pdev->dev, "rtas_msi: no req#msi, nothing to do.\n");
+        if (check_req_msi(pdev, 1) && check_req_msix(pdev, 1)) {
+                dev_dbg(&pdev->dev, "rtas_msi: no req#msi/x, nothing to do.\n");
                 return;
         }