1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index da1bbf3eda55..6d36b7630491 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -826,6 +826,14 @@ static void pnv_php_enable_irq(struct pnv_php_slot *php_slot)
         struct pci_dev *pdev = php_slot->pdev;
         int irq, ret;
 
+        /*
+         * The MSI/MSIx interrupt might have been occupied by other
+         * drivers. Don't populate the surprise hotplug capability
+         * in that case.
+         */
+        if (pci_dev_msi_enabled(pdev))
+                return;
+
         ret = pci_enable_device(pdev);
         if (ret) {
                 dev_warn(&pdev->dev, "Error %d enabling device\n", ret);