---

yaml --- r: 91674 b: refs/heads/master c: 4c44bac h: refs/heads/master v: v3
git-mirror · Apr 21, 2008 · 9d71ded · 9d71ded
1 parent faa2d12
commit 9d71ded
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ff580c10ec06fd296bd23d4570c1a95194094a0
+refs/heads/master: 4c44bac8645e0ce0249c53cc154f56b5543af232
diff --git a/trunk/drivers/pci/pcie/aer/aerdrv_acpi.c b/trunk/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;