Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d18690af authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Jesse Barnes
Browse files

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: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 0747aaf4

include/linux/pci-acpi.h

+6 −6
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ 
#ifdef CONFIG_ACPI

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)