Messages in this thread Patch in this message | | | Date | Wed, 28 Jan 2009 20:50:29 +0900 | From | Kenji Kaneshige <> | Subject | [PATCH 2/8] PCI/ACPI: fix wrong assumption in acpi_find_root_bridge_handle |
| |
Current acpi_find_root_bridge_handle() has a assumption that pci_bus->self is NULL on the root pci bus. But it might not be true on some platforms. Because of this wrong assumption, current acpi_find_root_bridge_handle() might cause endless loop. We must check pci_bus->parent instead.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
--- include/linux/pci-acpi.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Index: linux-2.6.29-rc2/include/linux/pci-acpi.h =================================================================== --- linux-2.6.29-rc2.orig/include/linux/pci-acpi.h +++ linux-2.6.29-rc2/include/linux/pci-acpi.h @@ -53,12 +53,12 @@ extern acpi_status pci_osc_control_set(a int pci_acpi_osc_support(acpi_handle handle, u32 flags); static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) { - /* Find root host bridge */ - while (pdev->bus->self) - pdev = pdev->bus->self; - - return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus), - pdev->bus->number); + struct pci_bus *pbus = pdev->bus; + /* Find a PCI root bus */ + while (pbus->parent) + pbus = pbus->parent; + return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), + pbus->number); } static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
| |