From 9d71ded64b4bbfa7e2729be12d1c056fe60e9d29 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <Yinghai.Lu@Sun.COM>
Date: Sat, 2 Feb 2008 22:24:47 -0800
Subject: [PATCH] --- yaml --- r: 91674 b: refs/heads/master c:
 4c44bac8645e0ce0249c53cc154f56b5543af232 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/pci/pcie/aer/aerdrv_acpi.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d0ca47690ceb..4c2a87fa6942 100644
--- 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
index 8c199ae84f6d..7e53fa590cf2 100644
--- 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;