diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-19 13:55:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-19 13:55:47 -0700 |
| commit | ddd13dc606ea1a06f2cf7d11dc06418de3e28121 (patch) | |
| tree | 25298e8eb405d4d3a6f0305136393782d3a7c760 /drivers/pci/pcie/aer/aerdrv_acpi.c | |
| parent | f607e3a03c90e8c050cb0c12ec9967c2925cc812 (diff) | |
| parent | a59f2bbaedc5de5a69db5d9c914462173ef3ffa6 (diff) | |
| download | op-kernel-dev-ddd13dc606ea1a06f2cf7d11dc06418de3e28121.zip op-kernel-dev-ddd13dc606ea1a06f2cf7d11dc06418de3e28121.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: add acpi_find_root_bridge_handle
PCI: acpi_pcihp: run _OSC on a root bridge
x86/PCI: irq and pci_ids patch for Intel Ibex Peak PCHs
x86/PCI: allow scanning of 255 PCI busses
x86, pci: detect end_bus_number according to acpi/e820 reserved, v2
pci: debug extra pci bus resources
pci: debug extra pci resources range
Diffstat (limited to 'drivers/pci/pcie/aer/aerdrv_acpi.c')
| -rw-r--r-- | drivers/pci/pcie/aer/aerdrv_acpi.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c index 30f581b..6dd7b13 100644 --- a/drivers/pci/pcie/aer/aerdrv_acpi.c +++ b/drivers/pci/pcie/aer/aerdrv_acpi.c @@ -36,12 +36,7 @@ int aer_osc_setup(struct pcie_device *pciedev) if (acpi_pci_disabled) return -1; - /* Find root host bridge */ - while (pdev->bus->self) - pdev = pdev->bus->self; - handle = acpi_get_pci_rootbridge_handle( - pci_domain_nr(pdev->bus), pdev->bus->number); - + handle = acpi_find_root_bridge_handle(pdev); if (handle) { pcie_osc_support_set(OSC_EXT_PCI_CONFIG_SUPPORT); status = pci_osc_control_set(handle, |
