From 1e99b816d8be13f3bca385e1f83df852e9d5f6f6 Mon Sep 17 00:00:00 2001
From: Andrew Patterson <andrew.patterson@hp.com>
Date: Tue, 22 Jan 2008 17:18:27 -0700
Subject: [PATCH] --- yaml --- r: 82355 b: refs/heads/master c:
 3c75e23784e6ed5f4841de43d0750fd9b37bafcb h: refs/heads/master i:   82353:
 576925cd4671a08075fa69461ada345ede1c2750   82351:
 b2f759f386faa54703e1f653d59958d60ef9ab96 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/pci/pcie/aer/aerdrv_acpi.c | 22 ++++++----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 888670c5dc07..90086027bd2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8634ddd371515740110d5658c3465a373894243
+refs/heads/master: 3c75e23784e6ed5f4841de43d0750fd9b37bafcb
diff --git a/trunk/drivers/pci/pcie/aer/aerdrv_acpi.c b/trunk/drivers/pci/pcie/aer/aerdrv_acpi.c
index f685bf5cdab9..8c199ae84f6d 100644
--- a/trunk/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/trunk/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -31,23 +31,13 @@ int aer_osc_setup(struct pcie_device *pciedev)
 {
 	acpi_status status = AE_NOT_FOUND;
 	struct pci_dev *pdev = pciedev->port;
-	acpi_handle handle = DEVICE_ACPI_HANDLE(&pdev->dev);
-	struct pci_bus *parent;
+	acpi_handle handle = 0;
 
-	while (!handle) {
-		if (!pdev || !pdev->bus->parent)
-			break;
-		parent = pdev->bus->parent;
-		if (!parent->self)
-			/* Parent must be a host bridge */
-			handle = acpi_get_pci_rootbridge_handle(
-					pci_domain_nr(parent),
-					parent->number);
-		else
-			handle = DEVICE_ACPI_HANDLE(
-					&(parent->self->dev));
-		pdev = parent->self;
-	}
+	/* Find root host bridge */
+	while (pdev->bus && pdev->bus->self)
+		pdev = pdev->bus->self;
+	handle = acpi_get_pci_rootbridge_handle(
+		pci_domain_nr(pdev->bus), pdev->bus->number);
 
 	if (handle) {
 		pcie_osc_support_set(OSC_EXT_PCI_CONFIG_SUPPORT);