Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI/ACPI: fix wrong assumption in acpi_find_root_bridge_handle

Browse source 
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>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Kenji Kaneshige 2009-02-17 14:12:36 +09:00 committed by Jesse Barnes
parent 0747aaf42d
commit d18690af62
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/linux/pci-acpi.h
View file

@ -13,12 +13,12 @@
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
{ {
/* Find root host bridge */ struct pci_bus *pbus = pdev->bus;
while (pdev->bus->self) /* Find a PCI root bus */
pdev = pdev->bus->self; while (pbus->parent)
pbus = pbus->parent;
return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus), return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
pdev->bus->number); pbus->number);
} }
static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus) static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)