1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index 8c199ae84f6..7e53fa590cf 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -33,6 +33,9 @@ int aer_osc_setup(struct pcie_device *pciedev)
         struct pci_dev *pdev = pciedev->port;
         acpi_handle handle = 0;
 
+        if (acpi_pci_disabled)
+                return -1;
+
         /* Find root host bridge */
         while (pdev->bus && pdev->bus->self)
                 pdev = pdev->bus->self;